Changeset 9154 for trunk/make/setup.os2relwat11.mk

Timestamp:

Aug 28, 2002, 7:02:23 AM (23 years ago)

Author:

bird

Message:

Made separate config for ilib and implib (all in one).

File:

• trunk/make/setup.os2relwat11.mk (modified) (6 diffs)

trunk/make/setup.os2relwat11.mk

@@ -1 @@
-# $Id: setup.os2relwat11.mk,v 1.8 2002-08-28 04:42:05 bird Exp $
+# $Id: setup.os2relwat11.mk,v 1.9 2002-08-28 05:02:23 bird Exp $
 
 #
@@ -26 +26 @@
 !include $(PATH_MAKE)\setup.os2relrc.mk
 !include $(PATH_MAKE)\setup.os2relwrc.mk
-!include $(PATH_MAKE)\setup.os2relwlink.mk
 !ifdef LD_USE_ILINK
 LD_OLDCPP       = 1
@@ -34 +33 @@
 ! include $(PATH_MAKE)\setup.os2relwlink.mk
 !endif
+!include $(PATH_MAKE)\setup.os2allilib.mk
 !include $(PATH_MAKE)\setup.optional.watcom11x.mk
 
@@ -40 +40 @@
 # The tools
 #
-AR=ilib.exe
 CC=wcc386.exe
 CXX=wpp386.exe
 LINK=wlink.exe
-IMPLIB=implib.exe
 
 
@@ -50 +48 @@
 # The flags
 #
-AR_FLAGS=/nologo /noignorecase
-AR_CMD=$(AR) $(AR_FLAGS) @"$(TARGET_LNK)"
-AR_LNK1= "$(@R).$(EXT_LIB)"
-AR_LNK2=y
-_AR_LNK3= +"$(TARGET_OBJS: ="&^
- +")"
-AR_LNK3= $(_AR_LNK3:+""&^
-=)
-AR_LNK4= "$(@R).lst";
-
 CC_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
 CC_FLAGS_EXE=$(CC_FLAGS) -omlinear -zc
@@ -102 +90 @@
 !endif
 
-IMPLIB_FLAGS=/NOI /Nologo
-
 
 #