Fix a few conversion bugs. For example, GLshort->GLfloat conversion

[mesa.git] / src / glut / dos / Makefile.DJ

diff --git a/src/glut/dos/Makefile.DJ b/src/glut/dos/Makefile.DJ
index 4586a0ba6991067c2d82823d028aaa8f37354238..7e4e0b8576a508102174d77a9b1806c938af2a0e 100644 (file)
--- a/src/glut/dos/Makefile.DJ
+++ b/src/glut/dos/Makefile.DJ
@@ -1,31 +1,25 @@
-# Mesa 3-D graphics library
-# Version:  4.0
-# 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
-# 
+# DOS/DJGPP Mesa Utility Toolkit
+# Version:  1.0
+#
+# Copyright (C) 2005  Daniel Borca   All Rights Reserved.
+#
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# DANIEL BORCA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP glut makefile v1.4 for Mesa
-#
-#  Copyright (C) 2002 - Borca Daniel
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
 
 #
 #  Available options:
@@ -33,8 +27,8 @@
 #    Environment variables:
 #      CFLAGS
 #
-#      MKGLUT          absolute path to original GLUT.
-#                      default = $(TOP)/src-glut
+#      GLIDE           path to Glide3 SDK; used to resolve DXEs.
+#                      default = $(TOP)/glide3
 #
 #    Targets:
 #      all:            build GLUT
@@ -46,8 +40,7 @@
 .PHONY: all clean
 
 TOP = ../../..
-GLIDE ?= $(TOP)/include/glide3
-MKGLUT ?= $(TOP)/src/glut/glx
+GLIDE ?= $(TOP)/glide3
 LIBDIR = $(TOP)/lib
 GLUT_LIB = libglut.a
 GLUT_DXE = glut.dxe
@@ -56,11 +49,11 @@ GLUT_IMP = libiglut.a
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
 
 CC = gcc
-CFLAGS += -I- -I$(TOP)/include -I. -I$(MKGLUT) -IPC_HW
+CFLAGS += -I$(TOP)/include -I. -IPC_HW
 CFLAGS += -DGLUT_IMPORT_LIB
 
 AR = ar
-ARFLAGS = rus
+ARFLAGS = crus
 
 HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
 
@@ -71,6 +64,7 @@ UNLINK = $(RM) $(1)
 endif
 
 CORE_SOURCES = \
+       loop.c \
        callback.c \
        color.c \
        extens.c \
@@ -80,7 +74,20 @@ CORE_SOURCES = \
        overlay.c \
        state.c \
        util.c \
-       window.c
+       window.c \
+       f8x13.c \
+       f9x15.c \
+       hel10.c \
+       hel12.c \
+       hel18.c \
+       tr10.c \
+       tr24.c \
+       mroman.c \
+       roman.c \
+       bitmap.c \
+       stroke.c \
+       teapot.c \
+       shapes.c
 
 PC_HW_SOURCES = \
        PC_HW/pc_hw.c \
@@ -89,25 +96,7 @@ PC_HW_SOURCES = \
        PC_HW/pc_timer.c \
        PC_HW/pc_irq.S
 
-MKGLUT_SOURCES = \
-       $(MKGLUT)/glut_bitmap.c \
-       $(MKGLUT)/glut_bwidth.c \
-       $(MKGLUT)/glut_stroke.c \
-       $(MKGLUT)/glut_swidth.c \
-       $(MKGLUT)/glut_shapes.c \
-       $(MKGLUT)/glut_teapot.c \
-       $(MKGLUT)/glut_8x13.c \
-       $(MKGLUT)/glut_9x15.c \
-       $(MKGLUT)/glut_hel10.c \
-       $(MKGLUT)/glut_hel12.c \
-       $(MKGLUT)/glut_hel18.c \
-       $(MKGLUT)/glut_tr10.c \
-       $(MKGLUT)/glut_tr24.c \
-       $(MKGLUT)/glut_roman.c \
-       $(MKGLUT)/glut_mroman.c \
-       $(MKGLUT)/glut_util.c
-
-SOURCES = $(CORE_SOURCES) $(PC_HW_SOURCES) $(MKGLUT_SOURCES)
+SOURCES = $(CORE_SOURCES) $(PC_HW_SOURCES)
 
 OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
 
@@ -127,12 +116,11 @@ $(LIBDIR)/$(GLUT_DXE) $(LIBDIR)/$(GLUT_IMP): $(OBJECTS)
 ifeq ($(HAVEDXE3),)
        $(warning Missing DXE3 package... Skipping $(GLUT_DXE))
 else
-       -dxe3gen -o $(LIBDIR)/$(GLUT_DXE) -Y $(LIBDIR)/$(GLUT_IMP) -D "MesaGLUT DJGPP" -E _glut -P gl.dxe -P glu.dxe -U $^
+       -dxe3gen -o $(LIBDIR)/$(GLUT_DXE) -Y $(LIBDIR)/$(GLUT_IMP) -D "MesaGLUT DJGPP" -E _glut -P gl.dxe -U $^
 endif
 
 clean:
        -$(call UNLINK,*.o)
        -$(call UNLINK,PC_HW/*.o)
-       -$(call UNLINK,$(MKGLUT)/*.o)
 
 -include depend