From 183aea64d3d45bfed30f07079a0c68fa7165bc0b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 29 Mar 2003 16:14:01 +0000 Subject: DOS updates from Daniel Borca --- src/glu/mesa/Makefile.DJ | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/glu/mesa') diff --git a/src/glu/mesa/Makefile.DJ b/src/glu/mesa/Makefile.DJ index e4423ccad08..b11b23345f8 100644 --- a/src/glu/mesa/Makefile.DJ +++ b/src/glu/mesa/Makefile.DJ @@ -54,11 +54,13 @@ CFLAGS += -I$(TOP)/include AR = ar ARFLAGS = rus -ifneq ($(wildcard $(DJDIR)/lib/dxe3.ld),) -DXE3GEN = $(wildcard $(addsuffix /dxe3gen.exe,$(subst ;, ,$(PATH)))) -endif +HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe) -RM = del +ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),) +UNLINK = del $(subst /,\,$(1)) +else +UNLINK = $(RM) $(1) +endif CORE_SOURCES = \ glu.c \ @@ -86,14 +88,13 @@ $(LIBDIR)/$(GLU_LIB): $(OBJECTS) $(AR) $(ARFLAGS) $(LIBDIR)/$(GLU_LIB) $(OBJECTS) $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP): $(OBJECTS) -ifeq ($(DXE3GEN),) - $(warning Missing DXE3GEN and/or DXE3.LD! You must have DXE3GEN) - $(warning somewhere in PATH, and DXE3.LD in DJGPP/LIB directory.) +ifeq ($(HAVEDXE3),) + $(warning Missing DXE3 package... Skipping $(GLU_DXE)) else -dxe3gen -o $(LIBDIR)/$(GLU_DXE) -I $(LIBDIR)/$(GLU_IMP) -D "MesaGLU DJGPP" -E _glu -P gl.dxe -U $(OBJECTS) endif clean: - -$(RM) $(subst /,\,*.o) + -$(call UNLINK,*.o) -include depend -- cgit v1.2.3