projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e59de90 TL |
1 | diff --git a/makefile.vc b/makefile.vc |
| 2 | index 120090eba..049c0d0b0 100644 | |
| 3 | --- a/makefile.vc | |
| 4 | +++ b/makefile.vc | |
| 5 | @@ -93,7 +93,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \ | |
| 6 | SPATIALITE_DLL = spatialite$(VERSION).dll | |
| 7 | ||
| 8 | CFLAGS = /nologo -I.\src\headers -I.\src\topology \ | |
| 9 | - -I. -IC:\OSGeo4W\include $(OPTFLAGS) | |
| 10 | + -I. $(OPTFLAGS) | |
| 11 | ||
| 12 | default: all | |
| 13 | ||
| 14 | @@ -107,12 +107,9 @@ spatialite.lib: $(LIBOBJ) | |
| 15 | $(SPATIALITE_DLL): spatialite_i.lib | |
| 16 | ||
| 17 | spatialite_i.lib: $(LIBOBJ) | |
| 18 | - link /dll /out:$(SPATIALITE_DLL) \ | |
| 19 | + link $(LINK_FLAGS) /dll /out:$(SPATIALITE_DLL) \ | |
| 20 | /implib:spatialite_i.lib $(LIBOBJ) \ | |
| 21 | - C:\OSGeo4W\lib\proj_i.lib C:\OSGeo4W\lib\geos_c.lib \ | |
| 22 | - C:\OSGeo4w\lib\freexl_i.lib C:\OSGeo4w\lib\iconv.lib \ | |
| 23 | - C:\OSGeo4W\lib\sqlite3_i.lib C:\OSGeo4W\lib\zlib.lib \ | |
| 24 | - C:\OSGeo4W\lib\libxml2.lib C:\OSGeo4W\lib\librttopo.lib | |
| 25 | + $(LIBS_ALL) | |
| 26 | if exist $(SPATIALITE_DLL).manifest mt -manifest \ | |
| 27 | $(SPATIALITE_DLL).manifest -outputresource:$(SPATIALITE_DLL);2 | |
| 28 | ||
| 29 | ||
| 30 | diff --git a/nmake.opt b/nmake.opt | |
| 31 | index c048aa758..be68e21cd 100644 | |
| 32 | --- a/nmake.opt | |
| 33 | +++ b/nmake.opt | |
| 34 | @@ -1,8 +1,8 @@ | |
| 35 | # Directory tree where SpatiaLite will be installed. | |
| 36 | -INSTDIR=C:\OSGeo4W | |
| 37 | +INSTDIR=$(INST_DIR) | |
| 38 | ||
| 39 | # Uncomment the first for an optimized build, or the second for debug. | |
| 40 | -OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ | |
| 41 | +OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ | |
| 42 | /DDLL_EXPORT /DYY_NO_UNISTD_H | |
| 43 | #OPTFLAGS= /nologo /Zi /MD /Fdspatialite.pdb /DDLL_EXPORT | |
| 44 |