Changeset 1661 for trunk

Timestamp:

Jan 26, 2012, 1:00:12 AM (14 years ago)

Author:

Steven Levine

Message:

Rework makefiles to allow highmem suppress from command line
See NOHIGHMEM

Location:

trunk

Files:

• dll/makefile (modified) (8 diffs)
• eas.mak (modified) (1 diff)
• makefile_post.mk (modified) (5 diffs)
• makefile_pre.mk (modified) (5 diffs)

trunk/dll/makefile

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2009 Steven H. Levine
+# Copyright (c) 2002, 2012 Steven H. Levine
 
 # 22 May 03 SHL Correct icon dependencies
@@ -43 +43 @@
 # 04 Jul 11 GKY Add eFTE backup files (*~) to clean target
 # 13 Aug 11 GKY Build xqs and sym files as part of dll and all targets
-
-# Environment: see makefile_pre.mk
+# 25 Jan 12 SHL Allow NOHIGHMEM set from enviroment
+
+# Environment: see makefile_pre.mk and makefile_post.mk
 
 # DEBUG - debug build if defined, release build if not defined
@@ -50 +51 @@
 # FORTIFY - enable FORTIFY heap checking if defined, omit FORITY support if not defined
 # USE_RC - use rc.exe if defined, use wrc.exe if not defined
+# NOHIGHMEM - support high memory use (i.e exehdir /highmem)
 
 BASE = fm3dll
@@ -88 +90 @@
 !ifdef %FORTIFY                 # if defined in environment
 FORTIFY = $(%FORTIFY)           # use value from environment
+!endif
+
+# Keep this code in sync with makefile_post.mk
+!ifndef NOHIGHMEM
+!ifdef %NOHIGHMEM
+NOHIGHMEM=$(%NOHIGHMEM)
+!endif
 !endif
 
@@ -201 +210 @@
      $(BASERES).res &
      $(BASERES).dll &
+!ifndef NOHIGHMEM
      loadhigh &
+!endif
      $(SYMS) &
      ipf\fm3.hlp
-     
+
 syms: $(SYMS) .symbolic
 
@@ -264 +275 @@
    @echo Processing: $?
    -perl ..\debugtools\mapsymw.pl $?
-   
+
 $(BASE).xqs: $(BASE).map .explicit
    @echo Processing: $?
-   -mapxqs $?   
+   -mapxqs $?
 
 $(BASERES).sym: $(BASERES).map .explicit
    @echo Processing: $?
    -perl ..\debugtools\mapsymw.pl $?
-   
+
 $(BASERES).xqs: $(BASERES).map .explicit
    @echo Processing: $?
-   -mapxqs $?   
+   -mapxqs $?
 
 !else # MAKERES defined
@@ -314 +325 @@
 !endif
 
+!ifndef NOHIGHMEM
 # Run for each dependent
 loadhigh: $(BASE).dll $(BASERES).dll .symbolic
   @for %f in ($(BASE).dll $(BASERES).dll) do !exehdr /hi %f
+!endif
 
 cleanobj: .symbolic
@@ -331 +344 @@
   -del *.obj
   -del *.res
-  -del *.sym 
+  -del *.sym
   -del *.xqs
   -del *~
-  
+

trunk/eas.mak

@@ -1 +1 @@
 # $Id$
 
-# Copyright (c) 2002, 2007 Steven H. Levine
+# Copyright (c) 2002, 2012 Steven H. Levine
 
 # 16 Jun 07 GKY Convert to OpenWatcom
 # 23 Feb 08 JBS Add support for building SYM files
 # 04 Jul 11 GKY Make xqs files an explicit target so they will be rebuild if lost somehow.
+# 25 Jan 12 SHL Renamae LOW -> NOHIGHMEM
 
 BASE=eas
-LOW=1
+NOHIGHMEM=1     # Avoid system traps
 
 !include makefile_pre.mk

trunk/makefile_post.mk

@@ -2 +2 @@
 # $Id$
 
-# Copyright (c) 2002, 2009 Steven H. Levine
+# Copyright (c) 2002, 2012 Steven H. Levine
 
 # 16 Aug 05 SHL Clean up
@@ -16 +16 @@
 # 21 Jun 11 GKY Make high memory builds the default resources only for exes
 # 04 Jul 11 GKY Make xqs files an explicit target so they will be rebuild if lost somehow.
+# 25 Jan 12 SHL Renamae LOW -> NOHIGHMEM and allow set from enviroment
 
 !ifndef MAKERES
@@ -22 +23 @@
 # Common parameters go in .lrf
 # Executable specific paramters go in .def
+# Put 32-bit data in high memoryt unless overridden
+
+!ifndef NOHIGHMEM
+!ifdef %NOHIGHMEM
+NOHIGHMEM=$(%NOHIGHMEM)
+!endif
+!endif
 
 $(BASE).exe: $(BASE).lrf $(BASE).obj $(BASE).res $(BASE).def .explicit
@@ -30 +38 @@
   @echo.
   $(RC) $(RCFLAGS2) $(BASE).res $@
-!ifndef LOW
-  !exehdr /hi:3 $@
+!ifndef NOHIGHMEM
+  !exehdr /highmem:3 $@
 !endif
 
-LOW =
+# 2012-01-25 SHL fixme to be gone - does not undefine
+# NOHIGHMEM =
 
 $(BASE).lrf: $(__MAKEFILES__) .explicit
@@ -49 +58 @@
 $(BASE).sym: $(BASE).map .explicit
    @echo Processing: $?
-   -perl debugtools\mapsymw.pl $?   
+   -perl debugtools\mapsymw.pl $?
 
 !else

trunk/makefile_pre.mk

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2011 Steven H. Levine
+# Copyright (c) 2002, 2012 Steven H. Levine
 
 # 03 Jan 08 SHL Switch to wrc.exe default; support USE_RC from environment
@@ -11 +11 @@
 # 06 Oct 08 SHL Pass DEBUG in CFLAGS; clean up USE_RC usage
 # 18 Nov 08 JBS Ticket 297: Various build improvements/corrections
-# 12 Jul 09 GKY Allow FM/2 to load in high memory call exehdr /hi
 # 13 Apr 10 SHL Drop HIMEM support
 # 21 Jun 11 GKY Add exceptq .xqs support
-# 2011-07-01 SHL sort map
+# 07 Jan 11 SHL sort map
+# 25 Jan 12 SHL Comments
 
 # Environment: see dll\makefile
@@ -39 +39 @@
 
 # Keep this code in sync with dll\makefile
-!ifdef DEBUG                    # if defined on wmake command line
+!ifdef DEBUG                    # if defined on wmake command line
 DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
 !else
-!ifdef %DEBUG                   # if defined in environment
-DEBUG = $(%DEBUG)               # use value from environment
+!ifdef %DEBUG                   # if defined in environment
+DEBUG = $(%DEBUG)               # use value from environment
 DEBUG_OPT = DEBUG=$(DEBUG)      # set in case needed by sub-make
 !endif
@@ -55 +55 @@
 FORTIFY_OPT = FORTIFY=$(FORTIFY)        # set in case needed by sub-make
 !else
-!ifdef %FORTIFY                         # if defined in environment
-FORTIFY = $(%FORTIFY)                   # use value from environment
+!ifdef %FORTIFY                         # if defined in environment
+FORTIFY = $(%FORTIFY)                   # use value from environment
 FORTIFY_OPT = FORTIFY=$(FORTIFY)        # set in case needed by sub-make
 !endif
 !endif
 
-SYMS = $(BASE).sym              #set a target for building SYM files
+SYMS = $(BASE).sym                      # target for building SYM files
 
 # Some flags are order dependent - see OpenWatcom docs
@@ -94 +94 @@
 
 # We always compile with debug info to avoid needing a full rebuild just to debug
-CFLAGS = -bt=os2 -mf -bm -d2 -olirs   -s -j -wx -zfp -zgp -zp4 -zq -hd
+CFLAGS = -bt=os2 -mf -bm -d2 -olirs -s -j -wx -zfp -zgp -zp4 -zq -hd
 
 !ifdef WARNALL