Changeset 10155 for trunk/make

Timestamp:

Jun 30, 2003, 3:19:52 PM (22 years ago)

Author:

bird

Message:

Win32 support - kind of working...

Location:

trunk/make

Files:

• process.mak (modified) (5 diffs)
• setup.win32allalp.mk (added)
• setup.win32allwcrc.mk (added)
• setup.win32debwat11.mk (modified) (7 diffs)
• setup.win32libs.mk (added)
• setup.win32relwat11.mk (added)

trunk/make/process.mak

@@ -1 @@
-# $Id: process.mak,v 1.36 2003-03-07 09:35:24 bird Exp $
+# $Id: process.mak,v 1.37 2003-06-30 13:19:49 bird Exp $
 #
 # Generic Buildsystem
@@ -598 +598 @@
         $(CC_FLAGS_IFS) \
 !endif
+!if "$(TARGET_MODE)" == "VDD"
+        $(CC_FLAGS_VDD) \
+!endif
 
 # Compiling C source.
@@ -656 +659 @@
     @ \
 !endif
-    $(TOOL_JOB_SUB) $(RC) $(RC_FLAGS) $(_SRC) $(_DST)
+    $(TOOL_JOB_SUB) $(RC) $(RC_FLAGS) $(_SRC) $(RC_RES_OUT)$(_DST)
 
 .rc.res:
@@ -664 +667 @@
     @ \
 !endif
-    $(RC) $(RC_FLAGS) $(_SRC) $(_DST)
+    $(RC) $(RC_FLAGS) $(_SRC) $(RC_RES_OUT)$(_DST)
 
 
@@ -1491 +1494 @@
     @ \
 ! endif
-    $(RL) $(RL_FLAGS) $(TARGET_RES) $@
+    $(RL) $(RL_FLAGS) $(TARGET_RES) $(RL_EXE_OUT)$@
 !endif
 !if "$(TARGET_DLLRNAME)" != ""

trunk/make/setup.win32debwat11.mk

@@ -1 @@
-# $Id: setup.win32debwat11.mk,v 1.14 2002-09-20 04:10:06 bird Exp $
+# $Id: setup.win32debwat11.mk,v 1.15 2003-06-30 13:19:51 bird Exp $
 
 # ---WIN32, DEBUG, WAT11-------------------------
@@ -16 +16 @@
 AS_DEBUG_TYPE = Codeview
 !include $(PATH_MAKE)\setup.os2as.mk
-!include $(PATH_MAKE)\setup.os2allrc.mk
-!include $(PATH_MAKE)\setup.os2allwrc.mk
+!include $(PATH_MAKE)\setup.win32allwcrc.mk
+#!include $(PATH_MAKE)\setup.os2allwrc.mk
 !ifdef LD_USE_ILINK
 ! error error: LD_USE_ILINK isn't supported by the win32 watcom setup.
@@ -23 +23 @@
 # TODO!
 _LD_LIBPATH     = $(PATH_WATCOM)\lib386\nt;$(PATH_WATCOM)\lib386;
+TOOL_MAPSYM_TYPE= WLINK
 ! include $(PATH_MAKE)\setup.os2relwlink.mk
 !endif
@@ -35 +36 @@
 CXX=wpp386.exe
 IMPLIB=implib.exe
+TOOL_STRIP=
 
 
@@ -47 +49 @@
 AR_LNK2= $(@R).lst
 
-CC_FLAGS=-bt=os2v2 -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -zq -fr=nul -bm -ze -w4 -d2 -hc -zc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CC_FLAGS=-bt=nt -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -zq -fr=nul -bm -ze -w4 -d2 -hc -zc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h\nt -i=$(WATCOM)\h
 CC_FLAGS_EXE=$(CC_FLAGS)
 CC_FLAGS_DLL=$(CC_FLAGS) -bd
@@ -54 +56 @@
 CC_FLAGS_IFS=$(CC_FLAGS_SYS) -bd
 
-CXX_FLAGS=-bt=os2v2 -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -zq -fr=nul -bm -ze -w4 -d2 -hc -zc (_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CXX_FLAGS=-bt=nt -dDEBUG -dWIN32 -d__32BIT__ -d__i386__ -zq -fr=nul -bm -ze -w4 -d2 -hc -zc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h\nt -i=$(WATCOM)\h
 CXX_FLAGS_EXE=$(CXX_FLAGS)
 CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
@@ -67 +69 @@
 # Libraries and object files.
 #
-LIB_OS      = $(WATCOM)\lib386\nt\kernel32.lib $(WATCOM)\lib386\nt\user32.lib $(WATCOM)\lib386\nt\gdi32.lib $(WATCOM)\lib386\nt\nt.lib
-LIB_C_OBJ   = clib3r.lib
-LIB_C_DLL   = clbrdll.lib
-LIB_C_RTDLL = clbrdll.lib
-LIB_C_NRE   = clib3r.lib
+LIB_OS      = $(WATCOM)\lib386\nt\kernel32.lib $(WATCOM)\lib386\nt\user32.lib $(WATCOM)\lib386\nt\gdi32.lib $(WATCOM)\lib386\nt\advapi32.lib $(WATCOM)\lib386\nt\nt.lib
+!if "$(_CXX_XCPT)" == "-xd"
+LIB_C_OBJ   = $(PATH_WATCOM)\lib386\nt\clib3r.lib $(PATH_WATCOM)\lib386\nt\plibmt3r.lib $(PATH_WATCOM)\lib386\plibmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\nt\emu387.lib
+LIB_C_DLL   = $(PATH_WATCOM)\lib386\nt\clbrdll.lib $(PATH_WATCOM)\lib386\nt\plbrdll.lib $(PATH_WATCOM)\lib386\plbrdll.lib $(PATH_WATCOM)\lib386\nt\mt7rdll.lib $(PATH_WATCOM)\lib386\nt\emu387.lib
+LIB_C_RTDLL = $(PATH_WATCOM)\lib386\nt\clbrdll.lib  # TODO
+LIB_C_NRE   = $(LIB_C_OBJ) # TODO
+!else
+LIB_C_OBJ   = $(PATH_WATCOM)\lib386\nt\clib3r.lib $(PATH_WATCOM)\lib386\nt\plbxmt3r.lib $(PATH_WATCOM)\lib386\plbxmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\nt\emu387.lib
+LIB_C_DLL   = $(PATH_WATCOM)\lib386\nt\clbrdll.lib $(PATH_WATCOM)\lib386\nt\plbrdllx.lib $(PATH_WATCOM)\lib386\plbrdllx.lib $(PATH_WATCOM)\lib386\nt\mt7rdll.lib $(PATH_WATCOM)\lib386\nt\emu387.lib
+LIB_C_RTDLL = $(PATH_WATCOM)\lib386\nt\clbrdll.lib  # TODO
+LIB_C_NRE   = $(LIB_C_OBJ) # TODO
+!endif
+#LIB_C_OBJ   = clib3r.lib
+#LIB_C_DLL   = clbrdll.lib
+#LIB_C_RTDLL = clbrdll.lib
+#LIB_C_NRE   = clib3r.lib
 LIB_C_DMNGL =
 OBJ_PROFILE =