Changeset 1661 for trunk/dll


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/makefile

    r1620 r1661  
    33
    44# Copyright (c) 1993-98 M. Kimes
    5 # Copyright (c) 2002, 2009 Steven H. Levine
     5# Copyright (c) 2002, 2012 Steven H. Levine
    66
    77# 22 May 03 SHL Correct icon dependencies
    … …  
    4343# 04 Jul 11 GKY Add eFTE backup files (*~) to clean target
    4444# 13 Aug 11 GKY Build xqs and sym files as part of dll and all targets
    45 
    46 # Environment: see makefile_pre.mk
     45# 25 Jan 12 SHL Allow NOHIGHMEM set from enviroment
     46
     47# Environment: see makefile_pre.mk and makefile_post.mk
    4748
    4849# DEBUG - debug build if defined, release build if not defined
    … …  
    5051# FORTIFY - enable FORTIFY heap checking if defined, omit FORITY support if not defined
    5152# USE_RC - use rc.exe if defined, use wrc.exe if not defined
     53# NOHIGHMEM - support high memory use (i.e exehdir /highmem)
    5254
    5355BASE = fm3dll
    … …  
    8890!ifdef %FORTIFY                 # if defined in environment
    8991FORTIFY = $(%FORTIFY)           # use value from environment
     92!endif
     93
     94# Keep this code in sync with makefile_post.mk
     95!ifndef NOHIGHMEM
     96!ifdef %NOHIGHMEM
     97NOHIGHMEM=$(%NOHIGHMEM)
     98!endif
    9099!endif
    91100
    … …  
    201210     $(BASERES).res &
    202211     $(BASERES).dll &
     212!ifndef NOHIGHMEM
    203213     loadhigh &
     214!endif
    204215     $(SYMS) &
    205216     ipf\fm3.hlp
    206      
     217
    207218syms: $(SYMS) .symbolic
    208219
    … …  
    264275   @echo Processing: $?
    265276   -perl ..\debugtools\mapsymw.pl $?
    266    
     277
    267278$(BASE).xqs: $(BASE).map .explicit
    268279   @echo Processing: $?
    269    -mapxqs $?   
     280   -mapxqs $?
    270281
    271282$(BASERES).sym: $(BASERES).map .explicit
    272283   @echo Processing: $?
    273284   -perl ..\debugtools\mapsymw.pl $?
    274    
     285
    275286$(BASERES).xqs: $(BASERES).map .explicit
    276287   @echo Processing: $?
    277    -mapxqs $?   
     288   -mapxqs $?
    278289
    279290!else # MAKERES defined
    … …  
    314325!endif
    315326
     327!ifndef NOHIGHMEM
    316328# Run for each dependent
    317329loadhigh: $(BASE).dll $(BASERES).dll .symbolic
    318330  @for %f in ($(BASE).dll $(BASERES).dll) do !exehdr /hi %f
     331!endif
    319332
    320333cleanobj: .symbolic
    … …  
    331344  -del *.obj
    332345  -del *.res
    333   -del *.sym 
     346  -del *.sym
    334347  -del *.xqs
    335348  -del *~
    336  
     349
Note: See TracChangeset for help on using the changeset viewer.