Changeset 249 for trunk/make

Timestamp:

Feb 8, 2003, 9:57:38 PM (23 years ago)

Author:

umoeller

Message:

Build updates, moved files from warpin.

Location:

trunk/make

Files:

• _sub_compile.in (modified) (1 diff)
• compile_dll_mt.in (modified) (1 diff)
• helpers.in (modified) (3 diffs)
• link_exe.in (modified) (2 diffs)

trunk/make/_sub_compile.in

@@ -45 +45 @@
 !endif
 
+.asm.{$(OUTPUTDIR)}.obj:
+    @echo   ### [$@]: Assembling $(@B).asm
+    alp -Sv:ALP -Fdo:$(OUTPUTDIR) $(@B).asm
+
+
+

trunk/make/compile_dll_mt.in

@@ -13 +13 @@
 #
 
+!ifndef CC_DLL_MT
+!error CC_DLL_MT is not defined.
+!endif
+
 CC = $(CC_DLL_MT)
 
-OUTPUTDIR = $(PROJECT_OUTPUT_DIR)
+OUTPUTDIR = $(PROJECT_OUTPUT_DIR)\dll_mt
 
 !include $(MAKE_INCLUDE_DIR)\_sub_compile.in

trunk/make/helpers.in

@@ -9 +9 @@
 !endif
 
-!if [@echo     $(MAKEDIR)\makefile: PROJECT_BASE_DIR is: $(PROJECT_BASE_DIR)]
-!endif
+# !if [@echo     $(MAKEDIR)\makefile: PROJECT_BASE_DIR is: $(PROJECT_BASE_DIR)]
+# !endif
 
 # include setup (compiler options etc.)
@@ -30 +30 @@
 OUTPUTDIR = $(HELPERS_OUTPUT_DIR)
 
-!if [@echo     $(MAKEDIR)\makefile: helpers OBJs will be written to $(OUTPUTDIR)]
-!endif
+# !if [@echo     $(MAKEDIR)\makefile: helpers OBJs will be written to $(OUTPUTDIR)]
+# !endif
 
 !if [@md $(OUTPUTDIR) 2> NUL]
@@ -69 +69 @@
 !endif
 
-.asm.{$(OUTPUTDIR)}.obj:
-    @echo $(MAKEDIR)\makefile: Assembling $(@B).asm
-    alp -Sv:ALP -Fdo:$(OUTPUTDIR) $(@B).asm
 
-
-

trunk/make/link_exe.in

@@ -63 +63 @@
 !endif
 
+!ifndef LINKCMD
+LINKCMD = $(LINK)
+!endif
+
 $(MODULESDIR)\$(MODULESTEM).exe: $(LINKOBJS) $(MODULEDEF) $(DEPEND_RES)
     @echo   ### [$@]: Linking $(@F)
-    $(LINK) @<<
+    $(LINKCMD) @<<
 /OUT:$@ $(MODULEDEF) $(LINKOBJS) $(PMPRINTF_LIB)
 <<KEEP
@@ -76 +80 @@
 !endif
     @cd $(MODULESDIR)
-    $(RUN_MAPSYM) $(@B).map
+    $(RUN_MAPSYM) $(MAPDIR)\$(@B).map
 !ifdef CVS_WORK_ROOT_DRIVE
     @$(CVS_WORK_ROOT_DRIVE)