Changeset 10248 for trunk/make

Timestamp:

Sep 14, 2003, 8:53:03 PM (22 years ago)

Author:

bird

Message:

Synced with other projects.

Location:

trunk/make

Files:

• setup.os2allrc.mk (modified) (2 diffs)
• setup.tools.mk (modified) (2 diffs)
• setup.win32debwat11.mk (modified) (4 diffs)

trunk/make/setup.os2allrc.mk

@@ -1 @@
-# $Id: setup.os2allrc.mk,v 1.2 2002-09-14 23:35:26 bird Exp $
+# $Id: setup.os2allrc.mk,v 1.3 2003-09-14 18:53:03 bird Exp $
 
 MAKE_INCLUDE_RC_SETUP = $(PATH_MAKE)\setup.os2allrc.mk
@@ -24 +24 @@
 !endif
            $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
+!if "$(RC_NO_EXEPACK2)" != ""
+RL_FLAGS = -n
+!else
 RL_FLAGS = -x2 -n
+!endif
 

trunk/make/setup.tools.mk

@@ -1 @@
-# $Id: setup.tools.mk,v 1.18 2002-09-20 04:35:45 bird Exp $
+# $Id: setup.tools.mk,v 1.19 2003-09-14 18:53:03 bird Exp $
 
 
@@ -64 +64 @@
 TOOL_MAPSYM     = $(PATH_TOOLS)\MapSym.cmd $(TOOL_MAPSYM_TYPE)
 TOOL_RM         = $(PATH_TOOLS)\rm.exe -fF
+TOOL_RMTREE     = $(PATH_TOOLS)\rm.exe -fFR
 TOOL_RMDIR      = rmdir
 TOOL_STRIP      = $(PATH_TOOLS)\lxlite.cmd

trunk/make/setup.win32debwat11.mk

@@ -1 @@
-# $Id: setup.win32debwat11.mk,v 1.15 2003-06-30 13:19:51 bird Exp $
+# $Id: setup.win32debwat11.mk,v 1.16 2003-09-14 18:53:03 bird Exp $
 
 # ---WIN32, DEBUG, WAT11-------------------------
@@ -27 +27 @@
 !endif
 !include $(PATH_MAKE)\setup.optional.watcom11x.mk
+!include $(PATH_MAKE)\setup.os2allwlib.mk
 
 
@@ -32 +33 @@
 # The tools
 #
-AR=ilib.exe
 CC=wcc386.exe
 CXX=wpp386.exe
@@ -42 +42 @@
 # The flags
 #
-AR_FLAGS=/nologo /noignorecase
-AR_CMD=$(AR) $(AR_FLAGS) $@ @$(TARGET_LNK)
-_AR_LNK1= "$(TARGET_OBJS: ="&^
-")"
-AR_LNK1= $(_AR_LNK1:""=)
-AR_LNK2= $(@R).lst
-
 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)