DOS updates for new tree (Daniel Borca)

1 files changed, 83 insertions, 86 deletions

diff --git a/progs/samples/Makefile.DJ b/progs/samples/Makefile.DJ
index e29e0e598c..13b1c7221b 100644
--- a/progs/samples/Makefile.DJ
+++ b/progs/samples/Makefile.DJ
@@ -1,86 +1,83 @@
-# Mesa 3-D graphics library

-# Version:  4.0

-# 

-# Copyright (C) 1999  Brian Paul   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

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-# DOS/DJGPP samples makefile v1.3 for Mesa

-#

-#  Copyright (C) 2002 - Borca Daniel

-#  Email : dborca@yahoo.com

-#  Web   : http://www.geocities.com/dborca

-

-

-#

-#  Available options:

-#

-#    Environment variables:

-#	CPU		optimize for the given processor.

-#			default = k6

-#	GLIDE		path to Glide3 SDK library files; used with FX.

-#			default = $(TOP)/lib/glide3

-#	FX=1		build for 3dfx Glide3. Note that this disables

-#			compilation of most DMesa code and requires fxMesa.

-#			As a consequence, you'll need the DJGPP Glide3

-#			library to build any application.

-#			default = no

-#	DXE=1		use DXE modules. The resolution object file must be

-#			present in the `lib' directory in order to use this

-#			option (see README.DJ for details).

-#			default = no

-#

-#    Targets:

-#	<file.exe>	build a specific file

-#

-

-

-

-.PHONY : all

-.SUFFIXES : .c .o .exe

-

-TOP = ..

-CPU ?= k6

-GLIDE ?= $(TOP)/lib/glide3

-

-CC = gcc

-CFLAGS = -Wall -W -pedantic

-CFLAGS += -O2 -ffast-math -mcpu=$(CPU)

-CFLAGS += -I$(TOP)/include

-

-LD = gxx

-LDFLAGS = -s -L$(TOP)/lib

-

-ifeq ($(DXE),1)

-DXE3TABLE = $(TOP)/lib/dxe3tbl.o

-LDLIBS += -liglut -liglu -ligl -ldl

-else

-LDLIBS = -lglut -lglu -lgl

-ifeq ($(FX),1)

-LDFLAGS += -L$(GLIDE)

-LDLIBS += -lglid3

-endif

-endif

-

-.c.o:

-	$(CC) -o $@ $(CFLAGS) -c $<

-.o.exe:

-	$(LD) -o $@ $(LDFLAGS) $(DXE3TABLE) $< $(LDLIBS)

-

-all:

-	$(error Must specify <filename.exe> to build)

+# Mesa 3-D graphics library
+# Version:  4.0
+# 
+# Copyright (C) 1999  Brian Paul   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
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# DOS/DJGPP samples makefile v1.4 for Mesa
+#
+#  Copyright (C) 2002 - Borca Daniel
+#  Email : dborca@yahoo.com
+#  Web   : http://www.geocities.com/dborca
+
+
+#
+#  Available options:
+#
+#    Environment variables:
+#	CPU		optimize for the given processor.
+#			default = k6
+#	GLIDE		path to Glide3 SDK library files; used with FX.
+#			default = $(TOP)/lib/glide3
+#	FX=1		build for 3dfx Glide3. Note that this disables
+#			compilation of most DMesa code and requires fxMesa.
+#			As a consequence, you'll need the DJGPP Glide3
+#			library to build any application.
+#			default = no
+#	DXE=1		use DXE modules (see README.DJ for details).
+#			default = no
+#
+#    Targets:
+#	<file.exe>	build a specific file
+#
+
+
+
+.PHONY : all
+.SUFFIXES : .c .o .exe
+
+TOP = ../..
+CPU ?= k6
+GLIDE ?= $(TOP)/lib/glide3
+
+CC = gcc
+CFLAGS = -Wall -W -pedantic
+CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS += -I$(TOP)/include -I../util
+
+LD = gxx
+LDFLAGS = -s -L$(TOP)/lib
+
+ifeq ($(DXE),1)
+LDLIBS += -liglut -liglu -ligl
+else
+LDLIBS = -lglut -lglu -lgl
+ifeq ($(FX),1)
+LDFLAGS += -L$(GLIDE)
+LDLIBS += -lglid3
+endif
+endif
+
+.c.o:
+	$(CC) -o $@ $(CFLAGS) -c $<
+.o.exe:
+	$(LD) -o $@ $(LDFLAGS) $< $(LDLIBS)
+
+all:
+	$(error Must specify <filename.exe> to build)