diff options
| author | Brian Paul <[email protected]> | 2003-08-19 15:52:51 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-08-19 15:52:51 +0000 |
| commit | 9ec58c2c5bbf90428a0e8e1c4f4af3805c602cd3 (patch) | |
| tree | 0519440b1cfa2b839ee1995b3e09d62dc05dd9d1 /src/glu | |
| parent | 3dc8cc4ebc63624dd521923271e63c2ac5a8aaae (diff) | |
DOS and glide driver updates from Daniel Borca
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/mesa/Makefile.DJ | 10 | ||||
| -rw-r--r-- | src/glu/sgi/Makefile.DJ | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/glu/mesa/Makefile.DJ b/src/glu/mesa/Makefile.DJ index 1e61080b49b..4d383cda315 100644 --- a/src/glu/mesa/Makefile.DJ +++ b/src/glu/mesa/Makefile.DJ @@ -23,7 +23,7 @@ # DOS/DJGPP glu makefile v1.4 for Mesa # # Copyright (C) 2002 - Borca Daniel -# Email : [email protected] +# Email : [email protected] # Web : http://www.geocities.com/dborca @@ -48,7 +48,7 @@ GLU_LIB = libglu.a GLU_DXE = glu.dxe GLU_IMP = libiglu.a -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR) +export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib CC = gcc CFLAGS += -I$(TOP)/include @@ -87,16 +87,14 @@ OBJECTS = $(SOURCES:.c=.o) all: $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP) $(LIBDIR)/$(GLU_LIB): $(OBJECTS) - $(AR) $(ARFLAGS) $(LIBDIR)/$(GLU_LIB) $(OBJECTS) + $(AR) $(ARFLAGS) $@ $^ $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP): $(OBJECTS) ifeq ($(HAVEDXE3),) $(warning Missing DXE3 package... Skipping $(GLU_DXE)) else - -dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU DJGPP" -E _glu -P gl.dxe -U $(OBJECTS) + -dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU DJGPP" -E _glu -P gl.dxe -U $^ endif clean: -$(call UNLINK,*.o) - --include depend diff --git a/src/glu/sgi/Makefile.DJ b/src/glu/sgi/Makefile.DJ index 0facbc7ee92..b3bad70181c 100644 --- a/src/glu/sgi/Makefile.DJ +++ b/src/glu/sgi/Makefile.DJ @@ -23,7 +23,7 @@ # DOS/DJGPP glu makefile v1.4 for Mesa # # Copyright (C) 2002 - Borca Daniel -# Email : [email protected] +# Email : [email protected] # Web : http://www.geocities.com/dborca @@ -48,7 +48,7 @@ GLU_LIB = libglu.a GLU_DXE = glu.dxe GLU_IMP = libiglu.a -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR) +export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib CC = gcc CFLAGS += -DNDEBUG -DLIBRARYBUILD -I$(TOP)/include -Iinclude @@ -171,13 +171,13 @@ OBJECTS = $(addsuffix .o,$(basename $(SOURCES))) all: $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP) $(LIBDIR)/$(GLU_LIB): $(OBJECTS) - $(AR) $(ARFLAGS) $(LIBDIR)/$(GLU_LIB) $(OBJECTS) + $(AR) $(ARFLAGS) $@ $^ $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP): $(OBJECTS) ifeq ($(HAVEDXE3),) $(warning Missing DXE3 package... Skipping $(GLU_DXE)) else - -dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU/SGI DJGPP" -E _glu -P gl.dxe -U $(OBJECTS) + -dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU/SGI DJGPP" -E _glu -P gl.dxe -U $^ endif clean: @@ -186,5 +186,3 @@ clean: -$(call UNLINK,libnurbs/interface/*.o) -$(call UNLINK,libnurbs/internals/*.o) -$(call UNLINK,libnurbs/nurbtess/*.o) - --include depend |