Changeset 6918 for trunk/src

Timestamp:

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

Author:

bird

Message:

Watcom: support to watcom+nmake.

Location:

trunk/src

Files:

• gdi32/makefile (modified) (2 diffs)
• odincrt/makefile (modified) (2 diffs)
• opengl/glu/tess/makefile (modified) (2 diffs)
• opengl/glu/util/makefile (modified) (3 diffs)
• opengl/mesa/3dfx/makefile (modified) (3 diffs)
• opengl/mesa/makefile (modified) (2 diffs)
• peldr/pec.mak (modified) (2 diffs)
• quartz/makefile (modified) (2 diffs)
• user32/Makefile (modified) (2 diffs)
• win32k/utils/makefile (modified) (3 diffs)
• win32k/win32k.tools.mk (modified) (2 diffs)

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.39 2001-09-30 08:56:17 bird Exp $
+# $Id: makefile,v 1.40 2001-10-01 01:40:08 bird Exp $
 
 #
@@ -18 +18 @@
 # Overrides.
 #
-!ifndef WAT
+!ifndef WMAKE
 CDEFINES    = $(CDEFINES) -DINVERT
 !else

trunk/src/odincrt/makefile

@@ -1 @@
-# $Id: makefile,v 1.23 2001-07-20 15:40:29 sandervl Exp $
+# $Id: makefile,v 1.24 2001-10-01 01:40:31 bird Exp $
 
 #
@@ -61 +61 @@
 $(OBJDIR)\file.obj
 !else
+!ifdef NMAKE
+$(WATCOM)\lib386\os2\$(RTLLIB_O)
+!else
 $(%WATCOM)\lib386\os2\$(RTLLIB_O)
+!endif
 !endif
 

trunk/src/opengl/glu/tess/makefile

@@ -1 @@
-# $Id: makefile,v 1.6 2000-12-02 23:59:13 bird Exp $
+# $Id: makefile,v 1.7 2001-10-01 01:40:56 bird Exp $
 
 #
@@ -28 +28 @@
 !if "$(VAC3)" == "1" || "$(VAC36)" == "1"
 CFLAGS      = $(CFLAGS) -Tdp
-CXXFLAGS    = $(CXXFLAGS) -Tdp
+!else
+!ifdef WAT
+C           = $(CXX)
+CFLAGS      = $(CXXFLAGS)
 !else
 !error "Compiler is not yet supported."
+!endif
 !endif
 

trunk/src/opengl/glu/util/makefile

@@ -1 @@
-# $Id: makefile,v 1.6 2000-12-02 23:59:06 bird Exp $
+# $Id: makefile,v 1.7 2001-10-01 01:40:57 bird Exp $
 
 #
@@ -22 +22 @@
 
 #
-# Flag overloads.
+# Overrides.
 #
 CINCLUDES   = $(CINCLUDES) -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
@@ -28 +28 @@
 !if "$(VAC3)" == "1" || "$(VAC36)" == "1"
 CFLAGS      = $(CFLAGS) -Tdp
-CXXFLAGS    = $(CXXFLAGS) -Tdp
 !else
-!error "Compiler not supported yet!"
+!ifdef WAT
+C           = $(CXX)
+CFLAGS      = $(CXXFLAGS)
+!else
+!error "Compiler is not yet supported."
+!endif
 !endif
 

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
 

trunk/src/peldr/pec.mak

@@ -1 @@
-# $Id: pec.mak,v 1.4 2000-12-16 15:40:54 sandervl Exp $
+# $Id: pec.mak,v 1.5 2001-10-01 01:41:13 bird Exp $
 
 #
@@ -55 +55 @@
 #
 $(OBJDIR)\pec.obj: pe.cpp
-!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -DCOMMAND_LINE_VERSION -Fo$@ -c $**
+!if "$(VAC3)" == "1" || "$(VAC36)" == "1" || "$(WAT)" == "1"
+    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -DCOMMAND_LINE_VERSION -Fo$@ $**
 !else
 !error Compiler not supported yet

trunk/src/quartz/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2001-09-15 09:28:22 sandervl Exp $
+# $Id: makefile,v 1.4 2001-10-01 01:41:21 bird Exp $
 
 #
@@ -17 +17 @@
 # Overrides.
 #
-!ifndef WAT
+!ifndef WMAKE
 CDEFINES    = $(CDEFINES) -DICOM_CINTERFACE -DCINTERFACE
 !else

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.94 2001-09-30 08:53:17 bird Exp $
+# $Id: Makefile,v 1.95 2001-10-01 01:41:38 bird Exp $
 
 #
@@ -18 +18 @@
 # Overrides.
 #
-!ifndef WAT
+!ifndef WMAKE
 CDEFINES  = $(CDEFINES) -DINVERT -DCLIENTFRAME
 !else

trunk/src/win32k/utils/makefile

@@ -1 @@
-# $Id: makefile,v 1.6 2001-02-10 11:11:48 bird Exp $
+# $Id: makefile,v 1.7 2001-10-01 01:42:09 bird Exp $
 
 #
@@ -40 +40 @@
 #
 OBJS = \
-$(OBJDIR)\Win32kCC.obj 
+$(OBJDIR)\Win32kCC.obj
 #$(OBJDIR)\api.obj \
 #$(OBJDIR)\locks.obj
@@ -83 +83 @@
 # Extra rules to build api.obj and locks.obj
 #
-!if "$(VAC3)" == "1" | "$(VAC36)" == "1"
+!if "$(VAC3)" == "1" | "$(VAC36)" == "1" || "$(WAT)" == "1"
 $(OBJDIR)\api.obj: $(WIN32KAPI)\api.cpp
-    $(CC) -c $(CXXFLAGS) $(CDEFINES) $(CINCLUDES) -Fo$(OBJDIR)\$(@B).obj $**
+    $(CC) $(CXXFLAGS) $(CDEFINES) $(CINCLUDES) -Fo$(OBJDIR)\$(@B).obj $**
 
 $(OBJDIR)\locks.obj: $(WIN32KMISC)\locks.asm

trunk/src/win32k/win32k.tools.mk

@@ -1 @@
-# $Id: win32k.tools.mk,v 1.10 2001-06-10 01:38:09 bird Exp $
+# $Id: win32k.tools.mk,v 1.11 2001-10-01 01:42:09 bird Exp $
 
 #
@@ -67 +67 @@
 ILIB        = wlib /nobackup /nologo \
 
-!error "Compiler is not yet supported!"
+#!error "Compiler is not yet supported!"
+# need to get win32k.lib compiled...
+DDKPATH=
+TOOLKIT=
+MSCPATH=
 !else
 #