Changeset 436 for branches/branch-1-0/src

Timestamp:

May 25, 2018, 2:57:16 AM (7 years ago)

Author:

rlwalsh

Message:

makefile: add support for nmake32 syntax
patch from Steve Levine

File:

• branches/branch-1-0/src/helpers/makefile (modified) (2 diffs)

branches/branch-1-0/src/helpers/makefile

@@ -93 +93 @@
 !include helpers_pre.in
 
+# Check required macros
+
+!ifdef MAINMAKERUNNING
+!ifndef CC_HELPERS
+!error CC_HELPERS not defined
+!endif
+!ifndef PROJECT_BASE_DIR
+!error PROJECT_BASE_DIR not defined
+!endif
+!ifndef HELPERS_OUTPUT_DIR
+!error HELPERS_OUTPUT_DIR not defined
+!endif
+!ifndef CC_HELPERS
+!error CC_HELPERS not defined
+!endif
+!endif
+
 # The main target:
 # If we're called from the main makefile, MAINMAKERUNNING is defined,
@@ -98 +115 @@
 # Otherwise, we call the main makefile, which will again call ourselves later.
 
-all:   \
+# Support nmake32 syntax V1.0.12 (2018-05-07) [slevine]
+ 
 !ifndef MAINMAKERUNNING
-    callmainmake
-    @echo ----- Leaving $(MAKEDIR)
-!else
-    $(OUTPUTDIR)\helpers.lib
-#$(OBJS)
-    @echo ----- Leaving $(MAKEDIR)
-!endif
-
-plainc:   \
+all: callmainmake
+!else
+all: $(OUTPUTDIR)\helpers.lib
+!endif
+    @echo ----- Leaving $(MAKEDIR)
+
 !ifndef MAINMAKERUNNING
-    callmainmake
-    @echo ----- Leaving $(MAKEDIR)
-!else
-    $(OUTPUTDIR)\plainc.lib
-#$(OBJS)
-    @echo ----- Leaving $(MAKEDIR)
-!endif
-
-cp:   \
+plainc: callmainmake
+!else
+plainc: $(OUTPUTDIR)\plainc.lib
+!endif
+    @echo ----- Leaving $(MAKEDIR)
+
 !ifndef MAINMAKERUNNING
-    callmainmake
-    @echo ----- Leaving $(MAKEDIR)
-!else
-    $(OUTPUTDIR)\cp.lib
-#$(OBJS)
-    @echo ----- Leaving $(MAKEDIR)
-!endif
+cp: callmainmake
+!else
+cp: $(OUTPUTDIR)\cp.lib
+!endif
+    @echo ----- Leaving $(MAKEDIR)
+    @echo ----- Leaving $(MAKEDIR)