diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-28 16:09:42 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-28 16:09:42 +0000 |
| commit | 49d90824e01c9c9907b1d868f7e2a1b0bfd74465 (patch) | |
| tree | cc61d5eca972ad2717267643f4bbc9bf3d85a7e4 /src/makefile.vc | |
| parent | c79dc1c3a49316cfcc447fc6c16907d5c48e23b4 (diff) | |
| download | PROJ-49d90824e01c9c9907b1d868f7e2a1b0bfd74465.tar.gz PROJ-49d90824e01c9c9907b1d868f7e2a1b0bfd74465.zip | |
default to building against DLL, disable nad2nad.exe on win32
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1258 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/makefile.vc')
| -rw-r--r-- | src/makefile.vc | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/makefile.vc b/src/makefile.vc index 3aa879c8..f565e422 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -8,8 +8,12 @@ PROJ_LIB_DIR=C:/PROJ/NAD # Uncomment the first for an optimized build, or the second for debug. -OPTFLAGS= /nologo /Ox -#OPTFLAGS= /nologo /Zi /Fdproj.pdb +OPTFLAGS= /nologo /Ox /MD +#OPTFLAGS= /nologo /Zi /MD /Fdproj.pdb + +# Uncomment the first for linking exes against DLL or second for static +EXE_PROJ = proj_i.lib +#EXE_PROJ = proj.lib # Set the version number for the DLL. Normally we leave this blank since # we want software that is dynamically loading the DLL to have no problem @@ -72,30 +76,32 @@ CFLAGS = /nologo -I. -DPROJ_LIB=\"$(PROJ_LIB_DIR)\" \ default: all -all: proj.lib $(PROJ_DLL) proj.exe cs2cs.exe geod.exe nad2nad.exe +all: proj.lib proj.exe cs2cs.exe geod.exe proj.lib: $(LIBOBJ) if exist proj.lib del proj.lib lib /out:proj.lib $(LIBOBJ) -$(PROJ_DLL): $(LIBOBJ) +$(PROJ_DLL): proj_i.lib + +proj_i.lib: $(LIBOBJ) link /debug /dll /def:proj.def /out:$(PROJ_DLL) /implib:proj_i.lib \ $(LIBOBJ) -proj.exe: $(PROJEXE_OBJ) proj.lib - cl $(PROJEXE_OBJ) proj.lib +proj.exe: $(PROJEXE_OBJ) $(EXE_PROJ) + cl $(PROJEXE_OBJ) $(EXE_PROJ) -cs2cs.exe: $(CS2CSEXE_OBJ) proj.lib - cl $(CS2CSEXE_OBJ) proj.lib +cs2cs.exe: $(CS2CSEXE_OBJ) $(EXE_PROJ) + cl $(CS2CSEXE_OBJ) $(EXE_PROJ) -geod.exe: $(GEODEXE_OBJ) proj.lib - cl $(GEODEXE_OBJ) proj.lib +geod.exe: $(GEODEXE_OBJ) $(EXE_PROJ) + cl $(GEODEXE_OBJ) $(EXE_PROJ) -nad2nad.exe: nad2nad.obj emess.obj proj.lib - cl nad2nad.obj emess.obj proj.lib +nad2nad.exe: nad2nad.obj emess.obj $(EXE_PROJ) + cl nad2nad.obj emess.obj $(EXE_PROJ) -nad2bin.exe: nad2bin.obj emess.obj proj.lib - cl nad2bin.obj emess.obj proj.lib +nad2bin.exe: nad2bin.obj emess.obj $(EXE_PROJ) + cl nad2bin.obj emess.obj $(EXE_PROJ) nadshift: nad2bin.exe cd ..\nad |