diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nmake.opt | 15 |
2 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2009-09-29 Frank Warmerdam <warmerdam@pobox.com> + + * nmake.opt: Update so that various items can be externally + overridden (#54). + 2009-09-24 Frank Warmerdam <warmerdam@pobox.com> * nad/Makefile.am: add ntv2 and ignf testing if grid shift files @@ -1,5 +1,11 @@ +!IFDEF EXT_NMAKE_OPT +!INCLUDE $(EXT_NMAKE_OPT) +!ENDIF + # Directory tree where PROJ will be installed. +!IFNDEF INSTDIR INSTDIR=C:\PROJ +!ENDIF # Set the following to the directory where the PROJ distribution data files # (ie, the contents of ..\NAD) are to be installed. It is possible to later @@ -9,11 +15,18 @@ INSTDIR=C:\PROJ # distribution. Any setting of the PROJ_LIB environment variable takes # precedence at runtime over the setting of the PROJ_LIB_DIR macro stored in # the compiled software. +!IFNDEF PROJ_LIB_DIR PROJ_LIB_DIR=$(INSTDIR)\SHARE +!ENDIF # Uncomment the first for an optimized build, or the second for debug. +!IFNDEF OPTFLAGS +!IFNDEF DEBUG OPTFLAGS= /nologo /Ox /Op /MD -#OPTFLAGS= /nologo /Zi /MD /Fdproj.pdb +!ELSE +OPTFLAGS= /nologo /Zi /MD /Fdproj.pdb +!ENDIF +!ENDIF # Uncomment the first for linking exes against DLL or second for static EXE_PROJ = proj_i.lib |