From 94fe2125da8619a76c5d38829543cb5818b73731 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 18 Jun 2014 08:30:53 -0700 Subject: Starting to integrate cURL into Balau. --- win32/project/Balau.vcxproj | 16 +++++----- win32/project/libcurl.vcxproj | 68 +++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 42 deletions(-) (limited to 'win32/project') diff --git a/win32/project/Balau.vcxproj b/win32/project/Balau.vcxproj index d23c043..131042e 100644 --- a/win32/project/Balau.vcxproj +++ b/win32/project/Balau.vcxproj @@ -86,8 +86,8 @@ Level3 Disabled true - PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;PTW32_STATIC_LIB;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions) - ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions) + ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include 4290;4800 $(SolutionDir)\Balau\msvc-config.h ProgramDatabase @@ -101,8 +101,8 @@ Level3 Disabled true - PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;PTW32_STATIC_LIB;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions) - ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions) + ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include 4290;4800 $(SolutionDir)\Balau\msvc-config.h @@ -117,8 +117,8 @@ true true true - PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;PTW32_STATIC_LIB;NDEBUG;%(PreprocessorDefinitions) - ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;NDEBUG;%(PreprocessorDefinitions) + ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include 4290;4800 $(SolutionDir)\Balau\msvc-config.h @@ -135,8 +135,8 @@ true true true - PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;PTW32_STATIC_LIB;NDEBUG;%(PreprocessorDefinitions) - ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;NDEBUG;%(PreprocessorDefinitions) + ..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include 4290;4800 $(SolutionDir)\Balau\msvc-config.h diff --git a/win32/project/libcurl.vcxproj b/win32/project/libcurl.vcxproj index b555954..563bc4c 100644 --- a/win32/project/libcurl.vcxproj +++ b/win32/project/libcurl.vcxproj @@ -1,20 +1,20 @@  - - LIB Debug - DLL Windows SSPI + + Debug Win32 - - LIB Debug - DLL Windows SSPI + + Debug x64 - - LIB Release - DLL Windows SSPI + + Release Win32 - - LIB Release - DLL Windows SSPI + + Release x64 @@ -23,25 +23,25 @@ libcurl - + StaticLibrary false MultiByte v120 - + StaticLibrary false MultiByte v120 - + StaticLibrary false MultiByte v120 - + StaticLibrary false MultiByte @@ -50,37 +50,37 @@ - + - + - + - + <_ProjectFileVersion>10.0.30319.1 - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win32\VC12\$(Configuration)\ - $(OutDir)lib\ - ..\..\..\..\build\Win64\VC12\$(Configuration)\ - $(OutDir)lib\ - $(ProjectName)d - $(ProjectName)d + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win32\VC12\$(Configuration)\ + $(OutDir)lib\ + ..\..\..\..\build\Win64\VC12\$(Configuration)\ + $(OutDir)lib\ + $(ProjectName)d + $(ProjectName)d - + Disabled .;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN32;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -102,14 +102,14 @@ $(OutDir)$(ProjectName).bsc - + X64 Disabled .;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN64;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -131,12 +131,12 @@ $(OutDir)$(ProjectName).bsc - + MaxSpeed OnlyExplicitInline .;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN32;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -157,7 +157,7 @@ $(OutDir)$(ProjectName).bsc - + X64 @@ -165,7 +165,7 @@ MaxSpeed OnlyExplicitInline .;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN64;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL true -- cgit v1.2.3