Changeset 1514

Timestamp:

Apr 13, 2010, 10:55:04 PM (16 years ago)

Author:

Steven Levine

Message:

Rework makefiles dropping support for obsolete HIMEM setting

Location:

trunk

Files:

• dll/makefile (modified) (4 diffs)
• makefile (modified) (4 diffs)
• makefile_pre.mk (modified) (4 diffs)

trunk/dll/makefile

@@ -36 +36 @@
 # 12 Jul 09 GKY Allow FM/2 to load in high memory call exehdr /hi
 # 30 Jul 09 SHL Avoid attempting to attach resources to fm3res.map
+# 13 Apr 10 SHL Drop HIMEM support
 
 # Environment: see makefile_pre.mk
@@ -43 +44 @@
 # 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
-# HIMEM - load code and data in in high memory if defined, use low memory only if not defined
 
 BASE = fm3dll
@@ -82 +82 @@
 !ifdef %FORTIFY                 # if defined in environment
 FORTIFY = $(%FORTIFY)           # use value from environment
-!endif
-
-!ifdef %HIMEM                   # if defined in environment
-HIMEM = $(%HIMEM)               # use value from environment
 !endif
 
@@ -140 +136 @@
 !endif
 
-!ifdef HIMEM
-CFLAGS += -dHIMEM
-!endif
-
 # for fm3res only
 CFLAGSR = -bt=os2 -mf -bd -bm         -olirs -s     -j -we -wx -zfp -zgp -zp4 -zq

trunk/makefile

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2008 Steven H. Levine
+# Copyright (c) 2002, 2010 Steven H. Levine
 
 # 24 May 05 SHL Add clean and cleanobj target
@@ -26 +26 @@
 # 14 Dec 08 SHL Build fm3.sym
 # 12 Jul 09 GKY Allow FM/2 to load in high memory call exehdr /hi
+# 13 Apr 10 SHL Drop HIMEM support
 
 # Environment - see makefile_pre.mk and dll\makefile
@@ -55 +56 @@
 dist: all syms lxlite wpi .symbolic
 
-disth: $(BASE) allexe highmem syms lxlite wpi .symbolic
+disth: $(BASE) allexe syms lxlite wpi .symbolic
 
 # Only update resources
@@ -79 +80 @@
 
 $(BASE).obj: $(BASE).c dll\version.h .autodepend
-
-highmem: .symbolic
-!ifdef HIMEM
-  cd dll  
-  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) loadhigh
-  cd ..
-!else
-  @echo "HIMEM not set"
-!endif  
 
 # make EXE compenents

trunk/makefile_pre.mk

@@ -1 +1 @@
 # makefile_pre.mk - common makefile prefix settings for all makefiles
 # $Id$
+
+# Copyright (c) 1993-98 M. Kimes
+# Copyright (c) 2002, 2010 Steven H. Levine
 
 # 01 Sep 06 SHL Adjust .res case
@@ -17 +20 @@
 # 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
 
 # Environment: see dll\makefile
@@ -24 +28 @@
 # FORTIFY - build with FORTIFYed memory
 # USE_RC - build with rc.exe if defined, other build with wrc.exe
-# HIMEM - build with changes to allow loading in high memory
 
 CC = wcc386
@@ -61 +64 @@
 FORTIFY = $(%FORTIFY)                   # use value from environment
 FORTIFY_OPT = FORTIFY=$(FORTIFY)        # set in case needed by sub-make
-!endif
-!endif
-
-!ifdef HIMEM                    # if defined on wmake command line
-HIMEM_OPT =  HIMEM=$(HIMEM)
-!else
-!ifdef %HIMEM                   # if defined in environment
-HIMEM = $(%HIMEM)               # use value from environment
-HIMEM_OPT =  HIMEM=$(HIMEM)
 !endif
 !endif