diff options
| author | Pär Björklund <per.bjorklund@gmail.com> | 2016-04-09 14:45:41 +0200 |
|---|---|---|
| committer | Pär Björklund <per.bjorklund@gmail.com> | 2016-04-09 16:12:32 +0200 |
| commit | 68f26a41443e8af8cb11c5059a673f3b30cc7343 (patch) | |
| tree | 7c18de37f0a28f1f370dfe64d920d9deec1b0e48 /lib/win32 | |
| parent | a9cdf97565060d62114d45cf339b548ddf6cf1d6 (diff) | |
This should resolve the python issues caused by vs2015 upgrade.
Fixed copying of dll during build to avoid risking using python27.dll from system32
Rebuilt all statically linked libs with _ITERATOR_DEBUG_LEVEL=0 because of performance issues, especially during video development
Curl should once again be linked against openssl
switched all projects to use /MD or /MDd because it enables sharing of env between the loaded modules making our environment hacks less needed.
Added curl and openssl to ignore list to avoid them being hooked by our crt emulation. This needs a proper fix and is likely resolved by Voyager's PR
Diffstat (limited to 'lib/win32')
| -rw-r--r-- | lib/win32/Effects11/Effects11_2013.vcxproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/win32/Effects11/Effects11_2013.vcxproj b/lib/win32/Effects11/Effects11_2013.vcxproj index d0b8bfff29..3cdc19d28f 100644 --- a/lib/win32/Effects11/Effects11_2013.vcxproj +++ b/lib/win32/Effects11/Effects11_2013.vcxproj @@ -128,7 +128,7 @@ <ClCompile> <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <OpenMPSupport>false</OpenMPSupport> <IntrinsicFunctions>true</IntrinsicFunctions> <FloatingPointModel>Fast</FloatingPointModel> @@ -138,7 +138,7 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PrecompiledHeader>Use</PrecompiledHeader> @@ -212,7 +212,7 @@ <ClCompile> <WarningLevel>Level4</WarningLevel> <Optimization>MaxSpeed</Optimization> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <OpenMPSupport>false</OpenMPSupport> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> |