Changeset 9165 for trunk/make/setup.os2debwat11.mk

Timestamp:

Aug 29, 2002, 12:01:46 PM (23 years ago)

Author:

bird

Message:

Added new tools. Restructured tools. More options. Fixes.

File:

• trunk/make/setup.os2debwat11.mk (modified) (3 diffs)

trunk/make/setup.os2debwat11.mk

@@ -1 @@
-# $Id: setup.os2debwat11.mk,v 1.16 2002-08-28 05:02:21 bird Exp $
+# $Id: setup.os2debwat11.mk,v 1.17 2002-08-29 10:01:43 bird Exp $
 
 # ---OS2, DEBUG, WAT11-------------------------
@@ -16 +16 @@
 #
 AS_DEBUG_TYPE   = Codeview
-!include $(PATH_MAKE)\setup.os2debalp.mk
+!include $(PATH_MAKE)\setup.os2as.mk
 !include $(PATH_MAKE)\setup.os2debrc.mk
 !include $(PATH_MAKE)\setup.os2debwrc.mk
-!ifdef LD_USE_ILINK
+_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
 LD_OLDCPP       = 1
-! include $(PATH_MAKE)\setup.os2debilink.mk
-!else
-_LD_LIBPATH     = $(PATH_WATCOM)\lib386\os2;$(PATH_WATCOM)\lib386;
-! include $(PATH_MAKE)\setup.os2debwlink.mk
-!endif
-!include $(PATH_MAKE)\setup.os2allilib.mk
+!include $(PATH_MAKE)\setup.os2ld.mk
+!include $(PATH_MAKE)\setup.os2ar.mk
 !include $(PATH_MAKE)\setup.optional.watcom11x.mk
 
@@ -88 +84 @@
 LIB_OS      = os2386.lib
 !if "$(_CXX_XCPT)" == "-xd"
-LIB_C_OBJ   = clib3r.lib plibmt3r.lib math387r.lib emu387.lib
-LIB_C_DLL   = clbrdll.lib plbrdll.lib mt7rdll.lib emu387.lib
-LIB_C_RTDLL = clbrdll.lib  # TODO
+LIB_C_OBJ   = $(PATH_WATCOM)\lib386\os2\clib3r.lib $(PATH_WATCOM)\lib386\os2\plibmt3r.lib $(PATH_WATCOM)\lib386\plibmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
+LIB_C_DLL   = $(PATH_WATCOM)\lib386\os2\clbrdll.lib $(PATH_WATCOM)\lib386\os2\plbrdll.lib $(PATH_WATCOM)\lib386\plbrdll.lib $(PATH_WATCOM)\lib386\os2\mt7rdll.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
+LIB_C_RTDLL = $(PATH_WATCOM)\lib386\os2\clbrdll.lib  # TODO
 LIB_C_NRE   = $(LIB_C_OBJ) # TODO
 !else
-LIB_C_OBJ   = clib3r.lib plbxmt3r.lib math387r.lib emu387.lib
-LIB_C_DLL   = clbrdll.lib plbrdllx.lib mt7rdll.lib emu387.lib
-LIB_C_RTDLL = clbrdll.lib  # TODO
+LIB_C_OBJ   = $(PATH_WATCOM)\lib386\os2\clib3r.lib $(PATH_WATCOM)\lib386\os2\plbxmt3r.lib $(PATH_WATCOM)\lib386\plbxmt3r.lib $(PATH_WATCOM)\lib386\math387r.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
+LIB_C_DLL   = $(PATH_WATCOM)\lib386\os2\clbrdll.lib $(PATH_WATCOM)\lib386\os2\plbrdllx.lib $(PATH_WATCOM)\lib386\plbrdllx.lib $(PATH_WATCOM)\lib386\os2\mt7rdll.lib $(PATH_WATCOM)\lib386\os2\emu387.lib
+LIB_C_RTDLL = $(PATH_WATCOM)\lib386\os2\clbrdll.lib  # TODO
 LIB_C_NRE   = $(LIB_C_OBJ) # TODO
 !endif