AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix for /O2 not liking /RTC1

Browse Source
This commit is contained in:
Tom van Dijck 2015-06-10 16:26:51 -07:00
parent 913245013e
commit 678616b068
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions/vstudio/vs2010_vcxproj.lua
View File

@ -944,7 +944,8 @@
function m.basicRuntimeChecks(cfg)
if cfg.flags.NoRuntimeChecks or config.isOptimizedBuild(cfg) then
local runtime = config.getruntime(cfg)
if cfg.flags.NoRuntimeChecks or (config.isOptimizedBuild(cfg) and runtime:endswith("Debug")) then
p.w('<BasicRuntimeChecks>Default</BasicRuntimeChecks>')
end
end
@ -1591,7 +1592,7 @@
function m.runtimeLibrary(cfg)
local runtimes = {
StaticDebug = "MultiThreadedDebug",
StaticDebug = "MultiThreadedDebug",
StaticRelease = "MultiThreaded",
}
local runtime = runtimes[config.getruntime(cfg)]

5
tests/actions/vstudio/vc2010/test_compile_settings.lua
View File

@ -160,7 +160,6 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -176,7 +175,6 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<Optimization>MinSpace</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -192,7 +190,6 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -208,7 +205,6 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -612,7 +608,6 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
]]
end