Kaydet (Commit) 43d477b1 authored tarafından Michael Stahl's avatar Michael Stahl

curl: actually use Makefile.vc10 instead of Makefile.vc9

... they are currently identical but it seems more appropriate.

Change-Id: I5ecd7209bc29f32a2f04299d35364a10fe381a35
üst 20acae99
......@@ -72,7 +72,7 @@ else ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc9 \
MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \
cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
,lib)
......
......@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
$(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
lib/Makefile.vc9 \
lib/Makefile.vc10 \
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
......
--- curl-7.26.0/lib/Makefile.vc9
+++ misc/build/curl-7.26.0/lib/Makefile.vc9
--- curl-7.26.0/lib/Makefile.vc10
+++ misc/build/curl-7.26.0/lib/Makefile.vc10
@@ -116,7 +116,7 @@ LFLAGS = /nologo /machine:$(MACHINE)
SSLLIBS = libeay32.lib ssleay32.lib
ZLIBLIBSDLL = zdll.lib
......
MSVC: using SOLARINC and EXCFLAGS
--- curl/lib/Makefile.vc9 2012-05-24 12:07:02.000000000 -0400
+++ curl/lib/Makefile.vc9 2012-10-29 11:53:44.658809300 -0400
--- curl/lib/Makefile.vc10 2012-05-24 12:07:02.000000000 -0400
+++ curl/lib/Makefile.vc10 2012-10-29 11:53:44.658809300 -0400
@@ -117,7 +117,7 @@
ZLIBLIBSDLL = zdll.lib
ZLIBLIBS = zlib.lib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment