Changeset 703

Timestamp:

Jun 23, 2007, 6:32:51 AM (18 years ago)

Author:

John Small

Message:

• Watcom handles macros differently so some of the previous

warpin/makefile code has been broken since the conversion.
So the code was improved and moved to the base makefile to
make it work better.

• fm2.wis was added as a dependant to the WPI target in the

warpin/makefile file.

Location:

trunk

Files:

• makefile (modified) (2 diffs)
• warpin/makefile (modified) (1 diff)

trunk/makefile

@@ -13 +13 @@
 # 26 Aug 06 SHL Add rest of lxlite support
 # 14 Jun 07 SHL Convert to OpenWatcom
+# 22 Jun 07 JBS Moved some macro-handling code to this
+#               file from warpin\makefile because of some
+#               differences in how Watcom handles macros.
 
 # Environment:
 
-# DEBUG 0 = release build, 1 = debug build
+# DEBUG 0 = release build, 1 = debug build
 
 BASE = fm3
+
+# FM2_VER defines fm/2 WPI file name suffix
+# e.g. FM2_VER=-3-5-9 results in FM2-3-5-9.wpi being built
+# If FM2_VER is empty, then FM2.wpi is built
+# NOTE: Start the variable with '-'
+
+!ifndef FM2_VER                  # if defined on wmake command, use it
+FM2_VER=-3-6-0                   # default value
+!ifdef %FM2_VER                  # if defined via env. var.
+FM2_VER=$(%FM2_VER)              #     use the env. var.
+!endif
+!endif
+
+# FM2UTILS_VER defines the fm2utils WPI file name suffix.
+# e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
+# If FM2UTILS_VER is empty, then FM2UTILS.wpi is built
+# NOTE: Start the variable with '-'
+
+!ifndef FM2UTILS_VER             # if defined on wmake command, use it
+FM2UTILS_VER=-1-1                # default value
+!ifdef %FM2UTILS_VER             # if defined via env. var.
+FM2UTILS_VER=$(%FM2UTILS_VER)    #     use the env. var.
+!endif
+!endif
+
+# If BUILD_FM2UTILS = 1, build FM2UTILS*.wpi and FM2*.wpi
+# Otherwise build just FM2*.wpi
+
+!ifndef BUILD_FM2UTILS           # if defined on wmake command, use it
+!ifdef %BUILD_FM2UTILS           # else if defined via env. var.
+!ifneq %BUILD_FM2UTILS 1         #     if env. var. is anything but 1
+BUILD_FM2UTILS=0                 #     use a value of 0
+!else
+BUILD_FM2UTILS=1
+!endif
+!else
+BUILD_FM2UTILS=0                 # use default value if not defined via env. or command line
+!endif
+!endif
 
 !include makefile_pre.mk
@@ -51 +93 @@
 wpi: .symbolic
    cd warpin
-   $(MAKE) $(__MAKEOPTS__)
+   $(MAKE) $(__MAKEOPTS__) FM2_VER=$(FM2_VER) FM2UTILS_VER=$(FM2UTILS_VER) BUILD_FM2UTILS=$(BUILD_FM2UTILS)
    cd ..
 

trunk/warpin/makefile

@@ -7 +7 @@
 # 08 Jun 07 JBS Corrected BUILD_FM2UTILS code so that it is actually
 #               possible to disable the build of the FM2UTILS*.WPI file
+# 22 Jun 07 JBS Reworked the code related to macros in both this file
+#               and the base makefile. Also made the fm2.wis file a
+#               dependant of the WPI target.
 
-# Environment:
-
-# DEBUG  0 = release build, 1 = debug build
-
-# If BUILD_FM2UTILS defined, build FM2UTILS*.wpi and FM2*.wpi
-# Otherwise build just FM2*.wpi
-!ifndef BUILD_FM2UTILS
-BUILD_FM2UTILS=1
-!endif
-
-# FM2_VER defines fm/2 WPI file name suffix
-# e.g. FM2_VER=-3-5-9 results in FM2-3-5-9.wpi being built
-# If FM2_VER is empty, then FM2.wpi is built
-# NOTE: Start the variable with '-'
-
-!ifndef FM2_VER
-FM2_VER=-3-5-9
-!endif
-
-# FM2UTILS_VER defines the fm2utils WPI file name suffix.
-# e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
-# If FM2UTILS_VER is empty, then FM2UTILS.wpi is built
-# NOTE: Start the variable with '-'
-
-!ifndef FM2UTILS_VER
-FM2UTILS_VER=-1-0-1
-!endif
 
 all: wpi .symbolic
 
-!if $(BUILD_FM2UTILS) == 0
-wpi: checkfiles fm2$(FM2_VER).wpi .symbolic
+!ifeq BUILD_FM2UTILS 0
+wpi: checkfiles fm2.wis fm2$(FM2_VER).wpi .symbolic
 !else
-wpi: checkfiles fm2$(FM2_VER).wpi fm2utils$(FM2UTILS_VER).wpi .symbolic
+wpi: checkfiles fm2.wis fm2$(FM2_VER).wpi fm2utils$(FM2UTILS_VER).wpi .symbolic
 !endif