From 850346cbaff47fb70c9125e312d7799e66852b63 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 2 Nov 2014 14:47:47 +0000 Subject: build: Fixed the pre-processor separator in Visual Studio project files A left over from the VC6 project files, so mainly cosmetic in Visual Studio .NET as it can handle both comma and semi-colon characters for separating multiple pre-processor definitions. However, the IDE uses semi-colons if the value is edited, and as such, this may cause problems in future for anyone updating the files or merging patches. Used the Visual Studio IDE to correct the separator character. --- projects/Windows/VC7.1/lib/libcurl.tmpl | 24 ++++++++++---------- projects/Windows/VC7.1/src/curlsrc.tmpl | 40 ++++++++++++++++----------------- projects/Windows/VC7/lib/libcurl.tmpl | 24 ++++++++++---------- projects/Windows/VC7/src/curlsrc.tmpl | 40 ++++++++++++++++----------------- 4 files changed, 64 insertions(+), 64 deletions(-) (limited to 'projects/Windows') diff --git a/projects/Windows/VC7.1/lib/libcurl.tmpl b/projects/Windows/VC7.1/lib/libcurl.tmpl index 66414e2da..7be125b15 100644 --- a/projects/Windows/VC7.1/lib/libcurl.tmpl +++ b/projects/Windows/VC7.1/lib/libcurl.tmpl @@ -198,7 +198,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -245,7 +245,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -349,7 +349,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -396,7 +396,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_WINDOWS_SSPI,USE_SCHANNEL" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -443,7 +443,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -605,7 +605,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_WINDOWS_SSPI,USE_SCHANNEL" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -710,7 +710,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -757,7 +757,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -804,7 +804,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -851,7 +851,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -898,7 +898,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -1004,7 +1004,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" diff --git a/projects/Windows/VC7.1/src/curlsrc.tmpl b/projects/Windows/VC7.1/src/curlsrc.tmpl index e7d2e5866..3fa3b5cb3 100644 --- a/projects/Windows/VC7.1/src/curlsrc.tmpl +++ b/projects/Windows/VC7.1/src/curlsrc.tmpl @@ -22,7 +22,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -77,7 +77,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -132,7 +132,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -187,7 +187,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -244,7 +244,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -301,7 +301,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -358,7 +358,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -415,7 +415,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -470,7 +470,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -525,7 +525,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -580,7 +580,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -635,7 +635,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -692,7 +692,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -749,7 +749,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -806,7 +806,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -861,7 +861,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -916,7 +916,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -973,7 +973,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -1030,7 +1030,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -1085,7 +1085,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" diff --git a/projects/Windows/VC7/lib/libcurl.tmpl b/projects/Windows/VC7/lib/libcurl.tmpl index a6243500c..14fe09a47 100644 --- a/projects/Windows/VC7/lib/libcurl.tmpl +++ b/projects/Windows/VC7/lib/libcurl.tmpl @@ -180,7 +180,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -221,7 +221,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -313,7 +313,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -354,7 +354,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_WINDOWS_SSPI,USE_SCHANNEL" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -395,7 +395,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -539,7 +539,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_WINDOWS_SSPI,USE_SCHANNEL" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -632,7 +632,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -673,7 +673,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -714,7 +714,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -755,7 +755,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32,..\..\..\..\..\libssh2\include" - PreprocessorDefinitions="WIN32,NDEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL,USE_LIBSSH2,HAVE_LIBSSH2_H" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL;USE_LIBSSH2;HAVE_LIBSSH2_H" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -796,7 +796,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -890,7 +890,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\..\openssl\inc32" - PreprocessorDefinitions="WIN32,_DEBUG,BUILDING_LIBCURL,CURL_STATICLIB,USE_SSLEAY,USE_OPENSSL" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_SSLEAY;USE_OPENSSL" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" diff --git a/projects/Windows/VC7/src/curlsrc.tmpl b/projects/Windows/VC7/src/curlsrc.tmpl index bac7af632..3e6973f37 100644 --- a/projects/Windows/VC7/src/curlsrc.tmpl +++ b/projects/Windows/VC7/src/curlsrc.tmpl @@ -22,7 +22,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -71,7 +71,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -120,7 +120,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -169,7 +169,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -220,7 +220,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -271,7 +271,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -322,7 +322,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -373,7 +373,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -422,7 +422,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -471,7 +471,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -520,7 +520,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -569,7 +569,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -620,7 +620,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -671,7 +671,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -722,7 +722,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -771,7 +771,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -820,7 +820,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -871,7 +871,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,CURL_STATICLIB" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -922,7 +922,7 @@ AdditionalOptions="/EHsc " InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -971,7 +971,7 @@ AdditionalOptions="/EHsc " Optimization="0" AdditionalIncludeDirectories="$(ProgramFiles)\Microsoft Platform SDK\Include,..\..\..\..\include,..\..\..\..\lib,..\..\..\..\src" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" -- cgit v1.2.3