diff options
| author | Long Huan <8551701+longhuan2018@users.noreply.github.com> | 2020-12-19 04:02:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 12:02:48 -0800 |
| commit | 5790aea02ea2d35e43f79aadfa11fb244c3f413a (patch) | |
| tree | 5b9c45bad4360e8b4df84537b74aba8c10b12109 /ports/librttopo/fix-makefiles.patch | |
| parent | bdb225bc6890ac507175fe2623d7665936335781 (diff) | |
| download | vcpkg-5790aea02ea2d35e43f79aadfa11fb244c3f413a.tar.gz vcpkg-5790aea02ea2d35e43f79aadfa11fb244c3f413a.zip | |
[librttopo]new port (#15037)
Diffstat (limited to 'ports/librttopo/fix-makefiles.patch')
| -rw-r--r-- | ports/librttopo/fix-makefiles.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/ports/librttopo/fix-makefiles.patch b/ports/librttopo/fix-makefiles.patch new file mode 100644 index 000000000..41c6c8f92 --- /dev/null +++ b/ports/librttopo/fix-makefiles.patch @@ -0,0 +1,35 @@ +diff --git a/makefile.vc b/makefile.vc +index 1f790f0de..2f7e00f7b 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -17,11 +17,11 @@ LIBOBJ = src\box2d.obj src\bytebuffer.obj src\g_box.obj \ + src\rtout_kml.obj src\rtout_svg.obj src\rtout_twkb.obj src\rtout_wkb.obj \ + src\rtout_wkt.obj src\rtout_x3d.obj src\rtpoint.obj src\rtpoly.obj src\rtprint.obj \ + src\rtpsurface.obj src\rtspheroid.obj src\rtstroke.obj src\rttin.obj src\rttree.obj \ +- src\rttriangle.obj src\rtutil.obj src\stringbuffer.obj src\varint.obj ++ src\rttriangle.obj src\rtutil.obj src\stringbuffer.obj src\varint.obj src\rtt_tpsnap.obj + + LIBRTTOPO_DLL = librttopo$(VERSION).dll + +-CFLAGS = /nologo -IC:\OSGeo4W\include -I. -Iheaders $(OPTFLAGS) ++CFLAGS = /nologo -I. -Iheaders $(OPTFLAGS) + + default: all + + +diff --git a/nmake.opt b/nmake.opt +index 938979df1..ea80dab00 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -1,9 +1,8 @@ + # Directory tree where RTTOPO will be installed. +-INSTDIR=C:\OSGeo4W ++INSTDIR=$(INSTALLDIR) + + # Uncomment the first for an optimized build, or the second for debug. +-OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ +- /DDLL_EXPORT ++OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS + #OPTFLAGS= /nologo /Zi /MD /Fdlibrttopo.pdb /DDLL_EXPORT + + # Set the version number for the DLL. Normally we leave this blank since |