2012-10-29 10:50:32 -04:00
|
|
|
--- curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600
|
2012-07-02 07:26:07 -06:00
|
|
|
+++ misc/build/curl-7.26.0/Makefile.msvc.names 2012-07-02 07:20:39.323448800 -0600
|
|
|
|
|
@@ -43,7 +43,7 @@
|
|
|
|
|
!ENDIF
|
|
|
|
|
|
|
|
|
|
!IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == ""
|
|
|
|
|
-LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d
|
|
|
|
|
+LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)
|
|
|
|
|
!ENDIF
|
|
|
|
|
|
|
|
|
|
!IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == ""
|
|
|
|
|
@@ -51,7 +51,7 @@
|
|
|
|
|
!ENDIF
|
|
|
|
|
|
|
|
|
|
!IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == ""
|
|
|
|
|
-LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d
|
|
|
|
|
+LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)
|
|
|
|
|
!ENDIF
|
|
|
|
|
|
|
|
|
|
# --------------------------------------------
|
|
|
|
|
@@ -59,11 +59,11 @@
|
|
|
|
|
# --------------------------------------------
|
|
|
|
|
|
|
|
|
|
!IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == ""
|
|
|
|
|
-LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp
|
|
|
|
|
+LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)
|
|
|
|
|
!ENDIF
|
|
|
|
|
|
|
|
|
|
!IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == ""
|
|
|
|
|
-LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp
|
|
|
|
|
+LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)
|
|
|
|
|
!ENDIF
|
|
|
|
|
|
|
|
|
|
# --------------------------------------
|
2012-10-29 10:50:32 -04:00
|
|
|
--- curl/lib/Makefile.vc9 2012-05-24 12:07:02.000000000 -0400
|
|
|
|
|
+++ curl/lib/Makefile.vc9 2012-10-29 11:53:44.658809300 -0400
|
|
|
|
|
@@ -117,7 +117,7 @@
|
|
|
|
|
ZLIBLIBSDLL= zdll.lib
|
|
|
|
|
ZLIBLIBS = zlib.lib
|
|
|
|
|
WINLIBS = ws2_32.lib wldap32.lib
|
|
|
|
|
-CFLAGS = $(CFLAGS)
|
|
|
|
|
+CFLAGS = $(CFLAGS) $(EXCFLAGS)
|
|
|
|
|
|
|
|
|
|
CFGSET = FALSE
|
|
|
|
|
|
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3
lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.
openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.
Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
2013-04-14 13:52:56 +02:00
|
|
|
@@ -620,11 +620,11 @@
|
|
|
|
|
debug-dll-ssl-dll\libcurl.res \
|
|
|
|
|
debug-dll-zlib-dll\libcurl.res \
|
|
|
|
|
debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
|
|
|
|
|
- rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc
|
|
|
|
|
+ rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc
|
|
|
|
|
|
|
|
|
|
release-dll\libcurl.res \
|
2012-10-29 10:50:32 -04:00
|
|
|
release-dll-ssl-dll\libcurl.res \
|
|
|
|
|
release-dll-zlib-dll\libcurl.res \
|
|
|
|
|
release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
|
|
|
|
|
- rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc
|
|
|
|
|
+ rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc
|
|
|
|
|
!ENDIF # End of case where a config was provided.
|
