From 0beccdf58048900d9a7f675da65414d1ce43952e Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 24 Dec 2014 14:32:24 +0000 Subject: build: Removed WIN64 definition from the libcurl Visual Studio projects Removed the WIN64 pre-processor definition from the libcurl project files as: * WIN64 is not used in our source code * The curl projects files don't define it * It isn't required by or used in the platform SDK * For backwards compatability curl_setup.h defines WIN32 * The compiler automatically defines _WIN64 for x64 builds Historically Visual Studio projects have defined WIN32, in addition to the compiler defined _WIN32 definition, and I had incorrectly changed that to WIN64 for the x64 libcurl builds but not in the curl projects. As such, it is questionable whether this should be defined or not. For more information see the following cache of a discussion that took place on the microsoft.public.vc.mfc newsgroup: http://www.tech-archive.net/Archive/VC/microsoft.public.vc.mfc/2008-06/msg00074.html --- projects/Windows/VC10/lib/libcurl.tmpl | 50 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'projects/Windows/VC10/lib') diff --git a/projects/Windows/VC10/lib/libcurl.tmpl b/projects/Windows/VC10/lib/libcurl.tmpl index f9a4f17ab..fd5d1ddae 100644 --- a/projects/Windows/VC10/lib/libcurl.tmpl +++ b/projects/Windows/VC10/lib/libcurl.tmpl @@ -1,4 +1,4 @@ - + @@ -787,7 +787,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -873,7 +873,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -933,7 +933,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -989,7 +989,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -1067,7 +1067,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1153,7 +1153,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -1281,7 +1281,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1324,7 +1324,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1452,7 +1452,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -1493,7 +1493,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -1577,7 +1577,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1663,7 +1663,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -1723,7 +1723,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1778,7 +1778,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1859,7 +1859,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1888,7 +1888,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1943,7 +1943,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -1998,7 +1998,7 @@ Disabled ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) + _DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -2054,7 +2054,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -2109,7 +2109,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -2190,7 +2190,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -2219,7 +2219,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -2274,7 +2274,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -2329,7 +2329,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\..\openssl\inc32;..\..\..\..\..\libssh2\include;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) + NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H;%(PreprocessorDefinitions) true MultiThreadedDLL true -- cgit v1.2.3