Changeset 6918 for trunk/src/opengl/mesa

Timestamp:

Oct 1, 2001, 3:42:09 AM (24 years ago)

Author:

bird

Message:

Watcom: support to watcom+nmake.

Location:

trunk/src/opengl/mesa

Files:

• 3dfx/makefile (modified) (3 diffs)
• makefile (modified) (2 diffs)

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

@@ -1 @@
-# $Id: makefile,v 1.13 2000-12-03 05:13:02 bird Exp $
+# $Id: makefile,v 1.14 2001-10-01 01:40:57 bird Exp $
 
 #
@@ -41 +41 @@
 CFLAGS      = $(CFLAGS) /Wcnd- /Tdp
 !else
-!error "Compiler not supported yet!"
+!ifdef WAT
+C           = $(CXX)
+CFLAGS      = $(CXXFLAGS)
+!else
+!error "Compiler is not yet supported."
+!endif
 !endif
 
@@ -49 +54 @@
 #   This is BAD! Try make library in parent directory? Problem with different objects.
 #
-!ifndef WAT
+!if "$(VAC3)" == "1" || "$(VAC36)" == "1" || ("$(WAT)" == "1" && defined(NMAKE))
 {..}.c{$(OBJDIR)}.obj:
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -c -Fo$(OBJDIR)\$(@B).obj $<
+    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj $<
 
 {..}.asm{$(OBJDIR)}.obj:

trunk/src/opengl/mesa/makefile

@@ -1 @@
-# $Id: makefile,v 1.10 2000-12-02 23:58:37 bird Exp $
+# $Id: makefile,v 1.11 2001-10-01 01:40:57 bird Exp $
 
 #
@@ -22 +22 @@
               -DDIVE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM_NOT \
               -DFAST_MATH
+# kso: BUGBUG/TODO/FIXME
+#      this configuration looks fishy to me.
+#      is exceptions enabled or not???
+#
+!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
 CFLAGS      = $(CFLAGS_WIN32APP) /Wcnd- -Tdp
 CXXFLAGS    = $(CFLAGS_WIN32APP) /Wcnd- -Tdp
+!else
 !ifdef WAT
-!error "Compiler not supported yet!"
+C           = $(CXX)
+CFLAGS      = $(CFLAGS_WIN32APP)
+CXXFLAGS    = $(CFLAGS_WIN32APP)
+!else
+!error "Compiler is not yet supported."
+!endif
 !endif