Changeset 9153 for trunk/make/setup.os2relwat11-16.mk

Timestamp:

Aug 28, 2002, 6:42:06 AM (23 years ago)

Author:

bird

Message:

Splitted out the watcom linker into it own config files.
Option to use ilink with watcom environments.

File:

• trunk/make/setup.os2relwat11-16.mk (modified) (4 diffs)

trunk/make/setup.os2relwat11-16.mk

@@ -1 @@
-# $Id: setup.os2relwat11-16.mk,v 1.10 2002-08-27 03:58:03 bird Exp $
+# $Id: setup.os2relwat11-16.mk,v 1.11 2002-08-28 04:42:05 bird Exp $
 
 #
@@ -22 +22 @@
 # Include some shared standard stuff: ALP, WRC, VAC optional stuff.
 #
-AS_DEBUG_TYPE = Codeview
+AS_DEBUG_TYPE   = Codeview
 !include $(PATH_MAKE)\setup.os2relalp.mk
 !include $(PATH_MAKE)\setup.os2relrc.mk
 !include $(PATH_MAKE)\setup.os2relwrc.mk
+!ifdef LD_USE_ILINK
+LD_OLDCPP       = 1
+! include $(PATH_MAKE)\setup.os2relilink.mk
+!else
+_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
+! include $(PATH_MAKE)\setup.os2relwlink.mk
+!endif
 !include $(PATH_MAKE)\setup.optional.watcom11x.mk
 
@@ -35 +42 @@
 CC=wcc.exe
 CXX=wpp.exe
-LINK=wlink.exe
 IMPLIB=implib.exe
 
@@ -98 +104 @@
 IMPLIB_FLAGS=/NOI /Nologo
 
-LINK_FLAGS=Sort global Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) #Debug codeview all
-LINK_FLAGS_EXE=$(LINK_FLAGS)
-LINK_FLAGS_DLL=$(LINK_FLAGS)
-LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
-LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
-LINK_FLAGS_IFS=$(LINK_FLAGS) segment type code preload segment type data preload
-LINK_CMD_EXE=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_EXE)
-LINK_CMD_DLL=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_DLL)
-LINK_CMD_SYS=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_SYS)
-LINK_CMD_VDD=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_VDD)
-LINK_CMD_IFS=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_IFS)
-LINK_LNK1=file       $(TARGET_OBJS: =^
-file       )
-LINK_LNK2=libpath    $(WATCOM)\lib286\os2;$(WATCOM)\lib286;
-LINK_LNK3=option map=$(TARGET_MAP)
-LINK_LNK4=library    $(TARGET_LIBS: =^, )
-LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
-
-
 
 #