mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use powershell pre-build, switch back to /MT

This commit is contained in:
Miso Zmiric (Mike Squinter) 2015-05-30 22:11:06 +01:00
parent 121c3a1575
commit 21a5c02333
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pre-build.ps1 Normal file
View File

@ -0,0 +1,15 @@
$path = Split-Path $Script:MyInvocation.MyCommand.Path
$zip = $path+'\lib\orcalibs.zip'
$libs = $path+'\lib'
$libcurl = Test-Path $path\lib\libcurl\
$jansson = Test-Path $path\lib\jansson\
$sdl = Test-Path $path\lib\sdl\
if (!$libcurl -or !$jansson -or !$sdl) {
Invoke-WebRequest http://misozmiric.com/ted/openrct2/orcalibs-vs.zip -OutFile $path\lib\orcalibs.zip
rm $path\lib\libcurl -r -Force -ErrorAction SilentlyContinue
rm $path\lib\jansson -r -Force -ErrorAction SilentlyContinue
rm $path\lib\sdl -r -Force -ErrorAction SilentlyContinue
[System.Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') > $null
[System.IO.Compression.ZipFile]::ExtractToDirectory($zip, $libs)
rm $path\lib\orcalibs.zip -Force -ErrorAction SilentlyContinue
}

5
projects/libs/libs.vcxproj
View File

@ -70,7 +70,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;NS_ENABLE_THREADS;NS_ENABLE_SSL;DISABLE_MD5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<StructMemberAlignment>1Byte</StructMemberAlignment>
<DebugInformationFormat>
</DebugInformationFormat>
@ -84,8 +84,7 @@
<AdditionalDependencies>libcurl.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
<PreBuildEvent>
<Command>
</Command>
<Command>Powershell -NonInteractive -ExecutionPolicy "ByPass" -File "$(ProjectDir)../../pre-build.ps1"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>

2
projects/openrct2.vcxproj
View File

@ -307,7 +307,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>
</SDLCheck>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<StructMemberAlignment>1Byte</StructMemberAlignment>
<TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>
<OmitFramePointers>