diff options
| author | Long Huan <8551701+longhuan2018@users.noreply.github.com> | 2020-12-23 15:21:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-22 23:21:14 -0800 |
| commit | 8fda0d2956ba55e58fa81ab310bebfa1e09bee63 (patch) | |
| tree | 48dea290cc3c458f9795e51891a1757c792ad7a6 /ports/spatialite-tools/fix-makefiles.patch | |
| parent | 3efce9a5c9d53ac486693bc52fd97a98ae4be81c (diff) | |
| download | vcpkg-8fda0d2956ba55e58fa81ab310bebfa1e09bee63.tar.gz vcpkg-8fda0d2956ba55e58fa81ab310bebfa1e09bee63.zip | |
[spatialite-tools]update to 5.0.0 (#15039)
Diffstat (limited to 'ports/spatialite-tools/fix-makefiles.patch')
| -rw-r--r-- | ports/spatialite-tools/fix-makefiles.patch | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/ports/spatialite-tools/fix-makefiles.patch b/ports/spatialite-tools/fix-makefiles.patch index ff6e0ad0d..a5a579686 100644 --- a/ports/spatialite-tools/fix-makefiles.patch +++ b/ports/spatialite-tools/fix-makefiles.patch @@ -1,18 +1,18 @@ diff --git a/makefile.vc b/makefile.vc -index 33c85d2..c811e7d 100644 +index 53ef75197..d48fb02db 100644 --- a/makefile.vc +++ b/makefile.vc -@@ -15,7 +15,7 @@ SPATIALITE_OSM_RAW_EXE = spatialite_osm_raw.exe +@@ -16,7 +16,7 @@ SPATIALITE_OSM_RAW_EXE = spatialite_osm_raw.exe SPATIALITE_OSM_FILTER_EXE = spatialite_osm_filter.exe SPATIALITE_GML_EXE = spatialite_gml.exe -CFLAGS = /nologo -IC:\OSGeo4W\include $(OPTFLAGS) -+CFLAGS = /nologo -I$(INSTALLED_ROOT)\include $(OPTFLAGS) ++CFLAGS = /nologo $(OPTFLAGS) default: all -@@ -26,89 +26,58 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \ - $(SPATIALITE_OSM_FILTER_EXE) +@@ -27,96 +27,63 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \ + $(SPATIALITE_OSM_FILTER_EXE) $(SHP_SANITIZE_EXE) $(SPATIALITE_EXE): shell.obj - cl shell.obj C:\OSGeo4W\lib\proj_i.lib \ @@ -27,7 +27,7 @@ index 33c85d2..c811e7d 100644 - cl exif_loader.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl exif_loader.obj $(LIBS_ALL) ++ cl exif_loader.obj $(LIBS_ALL) if exist $(EXIF_LOADER_EXE).manifest mt -manifest \ $(EXIF_LOADER_EXE).manifest -outputresource:$(EXIF_LOADER_EXE);1 @@ -35,15 +35,23 @@ index 33c85d2..c811e7d 100644 - cl shp_doctor.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl shp_doctor.obj $(LIBS_ALL) ++ cl shp_doctor.obj $(LIBS_ALL) if exist $(SHP_DOCTOR_EXE).manifest mt -manifest \ $(SHP_DOCTOR_EXE).manifest -outputresource:$(SHP_DOCTOR_EXE);1 + $(SHP_SANITIZE_EXE): shp_sanitize.obj +- cl shp_sanitize.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl shp_sanitize.obj $(LIBS_ALL) + if exist $(SHP_SANITIZE_EXE).manifest mt -manifest \ + $(SHP_SANITIZE_EXE).manifest -outputresource:$(SHP_SANITIZE_EXE);1 + $(SPATIALITE_NETWORK_EXE): spatialite_network.obj - cl spatialite_network.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_network.obj $(LIBS_ALL) ++ cl spatialite_network.obj $(LIBS_ALL) if exist $(SPATIALITE_NETWORK_EXE).manifest mt -manifest \ $(SPATIALITE_TOOL_EXE).manifest \ -outputresource:$(SPATIALITE_TOOL_EXE);1 @@ -52,7 +60,7 @@ index 33c85d2..c811e7d 100644 - cl spatialite_tool.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_tool.obj $(LIBS_ALL) ++ cl spatialite_tool.obj $(LIBS_ALL) if exist $(SPATIALITE_TOOL_EXE).manifest mt -manifest \ $(SPATIALITE_TOOL_EXE).manifest \ -outputresource:$(SPATIALITE_TOOL_EXE);1 @@ -64,7 +72,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_net.obj $(LIBS_ALL) ++ cl spatialite_osm_net.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_NET_EXE);1 @@ -76,7 +84,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_map.obj $(LIBS_ALL) ++ cl spatialite_osm_map.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_MAP_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_MAP_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_MAP_EXE);1 @@ -86,7 +94,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_gml.obj $(LIBS_ALL) ++ cl spatialite_gml.obj $(LIBS_ALL) if exist $(SPATIALITE_GML_EXE).manifest mt -manifest \ $(SPATIALITE_GML_EXE).manifest \ -outputresource:$(SPATIALITE_GML_EXE);1 @@ -98,7 +106,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_raw.obj $(LIBS_ALL) ++ cl spatialite_osm_raw.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_RAW_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_RAW_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_RAW_EXE);1 @@ -107,12 +115,13 @@ index 33c85d2..c811e7d 100644 - cl spatialite_osm_filter.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_filter.obj $(LIBS_ALL) ++ cl spatialite_osm_filter.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_FILTER_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_FILTER_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_FILTER_EXE);1 + diff --git a/nmake.opt b/nmake.opt -index 4f4a953..d9efecf 100644 +index 4f4a9538e..d9efecf7b 100644 --- a/nmake.opt +++ b/nmake.opt @@ -1,8 +1,8 @@ |