diff options
| author | Long Huan <8551701+longhuan2018@users.noreply.github.com> | 2020-12-22 00:56:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 08:56:24 -0800 |
| commit | 05e79e93778622a6f9e3cb8a2362ef6f5df23ec5 (patch) | |
| tree | af73a03b13d6b64b552e2f7d250e14d2a2b45fee /ports/libspatialite/fix-makefiles.patch | |
| parent | 66bac12e4e54cc858bdf7f93c5786010b6812b13 (diff) | |
| download | vcpkg-05e79e93778622a6f9e3cb8a2362ef6f5df23ec5.tar.gz vcpkg-05e79e93778622a6f9e3cb8a2362ef6f5df23ec5.zip | |
[libspatialite] Update 5.0.0 (#15040)
* update to 5.0.0
* update
* update
* fix static build failed
* remove fix-latin-literals.patch
* Update portfile.cmake
Diffstat (limited to 'ports/libspatialite/fix-makefiles.patch')
| -rw-r--r-- | ports/libspatialite/fix-makefiles.patch | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/ports/libspatialite/fix-makefiles.patch b/ports/libspatialite/fix-makefiles.patch index 9372739bb..6466020bc 100644 --- a/ports/libspatialite/fix-makefiles.patch +++ b/ports/libspatialite/fix-makefiles.patch @@ -1,51 +1,34 @@ diff --git a/makefile.vc b/makefile.vc -index 9b9e8ee..b524a27 100644 +index 120090eba..049c0d0b0 100644 --- a/makefile.vc +++ b/makefile.vc -@@ -59,7 +59,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \ - src\versioninfo\version.obj src\virtualtext\virtualtext.obj +@@ -93,7 +93,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \ SPATIALITE_DLL = spatialite$(VERSION).dll --CFLAGS = /nologo -I.\src\headers -I. -IC:\OSGeo4W\include $(OPTFLAGS) -+CFLAGS = /nologo -I.\src\headers -I. -I$(INSTALLED_ROOT)\include $(OPTFLAGS) + CFLAGS = /nologo -I.\src\headers -I.\src\topology \ +- -I. -IC:\OSGeo4W\include $(OPTFLAGS) ++ -I. $(OPTFLAGS) default: all -@@ -73,12 +73,9 @@ spatialite.lib: $(LIBOBJ) +@@ -107,12 +107,9 @@ spatialite.lib: $(LIBOBJ) $(SPATIALITE_DLL): spatialite_i.lib spatialite_i.lib: $(LIBOBJ) -- link /debug /dll /out:$(SPATIALITE_DLL) \ +- link /dll /out:$(SPATIALITE_DLL) \ + link $(LINK_FLAGS) /dll /out:$(SPATIALITE_DLL) \ /implib:spatialite_i.lib $(LIBOBJ) \ - C:\OSGeo4W\lib\proj_i.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4w\lib\freexl_i.lib C:\OSGeo4w\lib\iconv.lib \ - C:\OSGeo4W\lib\sqlite3_i.lib C:\OSGeo4W\lib\zlib.lib \ -- C:\OSGeo4W\lib\libxml2.lib +- C:\OSGeo4W\lib\libxml2.lib C:\OSGeo4W\lib\librttopo.lib + $(LIBS_ALL) if exist $(SPATIALITE_DLL).manifest mt -manifest \ $(SPATIALITE_DLL).manifest -outputresource:$(SPATIALITE_DLL);2 -@@ -90,16 +87,7 @@ clean: - del *.exp - del *.manifest - del *.lib -- del src\gaiaaux\*.obj -- del src\gaiaexif\*.obj -- del src\gaiageo\*.obj -- del src\spatialite\*.obj -- del src\srsinit\*.obj -- del src\versioninfo\*.obj -- del src\virtualtext\*.obj -- del src\wfs\*.obj -- del src\dxf\*.obj -- del src\md5\*.obj -+ forfiles /m *.obj* /s /c "cmd /c del @path" & exit 0 - del *.pdb - install: all diff --git a/nmake.opt b/nmake.opt -index 0960ec1..276bc84 100644 +index c048aa758..be68e21cd 100644 --- a/nmake.opt +++ b/nmake.opt @@ -1,8 +1,8 @@ @@ -54,8 +37,8 @@ index 0960ec1..276bc84 100644 +INSTDIR=$(INST_DIR) # Uncomment the first for an optimized build, or the second for debug. --OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \ -+OPTFLAGS= /nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ +-OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ ++OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ /DDLL_EXPORT /DYY_NO_UNISTD_H #OPTFLAGS= /nologo /Zi /MD /Fdspatialite.pdb /DDLL_EXPORT |