From 9ec58c2c5bbf90428a0e8e1c4f4af3805c602cd3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 19 Aug 2003 15:52:51 +0000 Subject: DOS and glide driver updates from Daniel Borca --- progs/samples/Makefile.DJ | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'progs/samples/Makefile.DJ') diff --git a/progs/samples/Makefile.DJ b/progs/samples/Makefile.DJ index 13b1c7221b..f8b0ccda48 100644 --- a/progs/samples/Makefile.DJ +++ b/progs/samples/Makefile.DJ @@ -23,7 +23,7 @@ # DOS/DJGPP samples makefile v1.4 for Mesa # # Copyright (C) 2002 - Borca Daniel -# Email : dborca@yahoo.com +# Email : dborca@users.sourceforge.net # Web : http://www.geocities.com/dborca @@ -32,9 +32,9 @@ # # Environment variables: # CPU optimize for the given processor. -# default = k6 -# GLIDE path to Glide3 SDK library files; used with FX. -# default = $(TOP)/lib/glide3 +# default = pentium +# GLIDE path to Glide3 SDK; used with FX. +# default = $(TOP)/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 @@ -53,13 +53,14 @@ .SUFFIXES : .c .o .exe TOP = ../.. -CPU ?= k6 -GLIDE ?= $(TOP)/lib/glide3 +CPU ?= pentium +GLIDE ?= $(TOP)/glide3 CC = gcc CFLAGS = -Wall -W -pedantic CFLAGS += -O2 -ffast-math -mcpu=$(CPU) CFLAGS += -I$(TOP)/include -I../util +CFLAGS += -DGLUT_IMPORT_LIB LD = gxx LDFLAGS = -s -L$(TOP)/lib @@ -69,7 +70,7 @@ LDLIBS += -liglut -liglu -ligl else LDLIBS = -lglut -lglu -lgl ifeq ($(FX),1) -LDFLAGS += -L$(GLIDE) +LDFLAGS += -L$(GLIDE)/lib LDLIBS += -lglid3 endif endif -- cgit v1.2.3