From 0bb9f58d36b2130fa0eeba850671ffa512287b1b Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Wed, 30 Sep 2009 03:37:41 +0000 Subject: Update so that various items can be overridden externall (#54) git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1656 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- ChangeLog | 5 +++++ nmake.opt | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e1657f64..b6237a44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-29 Frank Warmerdam + + * nmake.opt: Update so that various items can be externally + overridden (#54). + 2009-09-24 Frank Warmerdam * nad/Makefile.am: add ntv2 and ignf testing if grid shift files diff --git a/nmake.opt b/nmake.opt index 9ec189ea..79637ea4 100644 --- a/nmake.opt +++ b/nmake.opt @@ -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 -- cgit v1.2.3