Changeset 3001 for trunk/src/opengl/mesa

Timestamp:

Mar 4, 2000, 8:41:39 PM (25 years ago)

Author:

bird

Message:

NODEGUGINFO was not considered. Using LD2 and LD2FLAGS solves this.

File:

• trunk/src/opengl/mesa/3dfx/makefile (modified) (5 diffs)

trunk/src/opengl/mesa/3dfx/makefile

@@ -1 @@
-# $Id: makefile,v 1.4 2000-03-02 13:25:33 sandervl Exp $
+# $Id: makefile,v 1.5 2000-03-04 19:41:39 bird Exp $
 #
 # PD-Win32
@@ -13 +13 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-!ifdef DEBUG
-L=/CO
-!endif
-
-MESADEFS=-DNO_PARALLEL -DNO_STEREO -DGL_MESA_window_pos -DTHREADS \
-         -DUSE_X86_ASM_NOT -DUSE_MMX_ASM_NOT -DUSE_3DNOW_ASM_NOT \
-         /DFX /DFX_V2 /DFX_SILENT /DBUILD_GL32
-
-CFLAGS = -I.. -I..\GL $(CFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
+MESADEFS= -DNO_PARALLEL -DNO_STEREO -DGL_MESA_window_pos -DTHREADS \
+          -DUSE_X86_ASM_NOT -DUSE_MMX_ASM_NOT -DUSE_3DNOW_ASM_NOT \
+          -DFX -DFX_V2 -DFX_SILENT -DBUILD_GL32
+
+CFLAGS   = -I.. -I..\GL $(CFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
 CXXFLAGS = -I.. -I..\GL $(CXXFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS)
 
@@ -56 +52 @@
 
 $(TARGET).DLL: $(OBJS) $(TARGET).lrf $(TARGET).def
-    -ILINK /FREE /NOE $(L) @$(TARGET).lrf
+    -$(LD2) $(LD2FLAGS) /FREE /NOE @$(TARGET).lrf
     $(CP) $@ $(PDWIN32_BIN)\Glide
 
@@ -75 +71 @@
 resource.asm: fxmesa32.rc
     $(RC) $(RCFLAGS) -o resource.asm fxmesa32.rc
+
+#
+# Tried to create a general interference rule for these?
+# As long as there isn't any .c, .cpp or .asm files with matching
+# names in the current directory thise shouldn't be any problem.
+# For example:
+#   {..}.c.obj:
+#       $(CC) $(CFLAGS) -c $<
+#
+# Regards knut.
+#
 
 accum.obj: ..\accum.c
@@ -232 +239 @@
 
 clean:
-        $(RM) *.obj
-        $(RM) *.dll
-        $(RM) *.lib
-        $(RM) *.lrf
-        $(RM) resource.asm
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
+    $(RM) *.obj *.dll *.lib *.lrf resource.asm $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib
+