diff options
| author | Jason Perkins <starkos@industriousone.com> | 2010-12-06 14:45:22 +0300 |
|---|---|---|
| committer | Jason Perkins <starkos@industriousone.com> | 2010-12-06 14:45:22 +0300 |
| commit | 90cc47165f5ea21870a425d209c19dc2ed8b6588 (patch) | |
| tree | 28ef53193f1760248a6e911d37d4fd72a8fcd1a6 /src | |
| parent | b1182478a2ac664f89cf66a0c456f32acfc6bf11 (diff) | |
More SNC changes: fixed location of PCH to match VS, fixed flags
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions/vstudio/_vstudio.lua | 2 | ||||
| -rw-r--r-- | src/actions/vstudio/vs200x_vcproj.lua | 4 | ||||
| -rw-r--r-- | src/actions/vstudio/vs2010_vcxproxj.lua | 2 | ||||
| -rw-r--r-- | src/tools/snc.lua | 26 |
4 files changed, 6 insertions, 28 deletions
diff --git a/src/actions/vstudio/_vstudio.lua b/src/actions/vstudio/_vstudio.lua index b598ef2..a40c317 100644 --- a/src/actions/vstudio/_vstudio.lua +++ b/src/actions/vstudio/_vstudio.lua @@ -231,7 +231,7 @@ -- flags get picked up from the main compiler config block? local buildoptions = table.join(premake.snc.getcflags(cfg), premake.snc.getcxxflags(cfg), cfg.buildoptions) local additionalOptions = table.concat(buildoptions, " "); - additionalOptions = additionalOptions .. " --create_pch=\"" .. path.getname(cfg.pchheader) .. ".pch" .. "\"" + additionalOptions = additionalOptions .. ' --create_pch="$(IntDir)/$(TargetName).pch"' attrib(indent, "\t\tAdditionalOptions", premake.esc(additionalOptions)) else attrib(indent, "\t\tUsePrecompiledHeader", "1") diff --git a/src/actions/vstudio/vs200x_vcproj.lua b/src/actions/vstudio/vs200x_vcproj.lua index ac9843a..9a74059 100644 --- a/src/actions/vstudio/vs200x_vcproj.lua +++ b/src/actions/vstudio/vs200x_vcproj.lua @@ -153,7 +153,7 @@ local vcproj = premake.vstudio.vcproj if _ACTION < "vs2005" and not cfg.flags.NoRTTI then _p(4,'RuntimeTypeInfo="%s"', _VS.bool(true)) - elseif _ACTION > "vs2003" and cfg.flags.NoRTTI then + elseif _ACTION > "vs2003" and cfg.flags.NoRTTI and not cfg.flags.Managed then _p(4,'RuntimeTypeInfo="%s"', _VS.bool(false)) end @@ -285,7 +285,7 @@ local vcproj = premake.vstudio.vcproj if not cfg.flags.NoPCH and cfg.pchheader then _p(4,'UsePrecompiledHeader="%s"', iif(_ACTION < "vs2005", 3, 2)) _p(4,'PrecompiledHeaderThrough="%s"', path.getname(cfg.pchheader)) - table.insert(buildoptions, "--use_pch=\"" .. path.getname(cfg.pchheader) .. ".pch" .. "\"") + table.insert(buildoptions, '--use_pch="$(IntDir)/$(TargetName).pch"') else _p(4,'UsePrecompiledHeader="%s"', iif(_ACTION > "vs2003" or cfg.flags.NoPCH, 0, 2)) end diff --git a/src/actions/vstudio/vs2010_vcxproxj.lua b/src/actions/vstudio/vs2010_vcxproxj.lua index 106c5ab..5ac58a3 100644 --- a/src/actions/vstudio/vs2010_vcxproxj.lua +++ b/src/actions/vstudio/vs2010_vcxproxj.lua @@ -270,7 +270,7 @@ local vs10_helpers = premake.vstudio.vs10_helpers end local function rtti(cfg) - if cfg.flags.NoRTTI then + if cfg.flags.NoRTTI and not cfg.flags.Managed then _p(3,'<RuntimeTypeInfo>false</RuntimeTypeInfo>') end end diff --git a/src/tools/snc.lua b/src/tools/snc.lua index 4928aaf..2aa5452 100644 --- a/src/tools/snc.lua +++ b/src/tools/snc.lua @@ -26,17 +26,8 @@ local cflags = { - EnableSSE = "-msse", - EnableSSE2 = "-msse2", - ExtraWarnings = "-Wall", - FatalWarnings = "-Werror", - FloatFast = "-ffast-math", - FloatStrict = "-ffloat-store", - NoFramePointer = "-fomit-frame-pointer", - Optimize = "-O2", - OptimizeSize = "-Os", - OptimizeSpeed = "-O3", - Symbols = "-g", + ExtraWarnings = "-Xdiag=2", + FatalWarnings = "-Xquit=2", } local cxxflags = @@ -52,19 +43,6 @@ premake.snc.platforms = { - Native = { - cppflags = "-MMD -MP", - }, - x32 = { - cppflags = "-MMD -MP", - flags = "-m32", - ldflags = "-L/usr/lib32", - }, - x64 = { - cppflags = "-MMD -MP", - flags = "-m64", - ldflags = "-L/usr/lib64", - }, PS3 = { cc = "ppu-lv2-g++", cxx = "ppu-lv2-g++", |