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

Merge pull request #36 from TurkeyMan/explicit_arch

Browse Source 
Added aliases for explicit architectures
This commit is contained in:
starkos 2015-04-13 12:49:04 -04:00
commit bf6e97ada8
14 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/xcode

@ -1 +1 @@
Subproject commit 3411729720af220dcac2526d7f64bda8320a5e2d
Subproject commit 897ad816714576a611d6d02c99e55a82954c5bbf

10
src/_premake_init.lua
View File

@ -23,8 +23,14 @@
kind = "string",
allowed = {
"universal",
"x32",
"x64",
"x86",
"x86_64",
},
aliases = {
i386 = "x86",
amd64 = "x86_64",
x32 = "x86", -- these should be DEPRECATED
x64 = "x86_64",
},
}

4
src/actions/vstudio/_vstudio.lua
View File

@ -21,8 +21,8 @@
vstudio.vs200x_architectures =
{
x32 = "x86",
x64 = "x64",
x86 = "x86",
x86_64 = "x64",
xbox360 = "Xbox 360",
}

6
src/actions/vstudio/vs200x_vcproj.lua
View File

@ -1094,7 +1094,7 @@
function m.enableEnhancedInstructionSet(cfg)
local map = { SSE = "1", SSE2 = "2" }
local value = map[cfg.vectorextensions]
if value and cfg.system ~= "Xbox360" and cfg.architecture ~= "x64" then
if value and cfg.system ~= "Xbox360" and cfg.architecture ~= "x86_64" then
p.w('EnableEnhancedInstructionSet="%d"', value)
end
end
@ -1541,7 +1541,7 @@
function m.targetEnvironment(cfg)
if cfg.architecture == "x64" then
if cfg.architecture == "x86_64" then
p.w('TargetEnvironment="3"')
end
end
@ -1564,7 +1564,7 @@
function m.targetMachine(cfg, toolset)
if not toolset then
p.w('TargetMachine="%d"', iif(cfg.architecture == "x64", 17, 1))
p.w('TargetMachine="%d"', iif(cfg.architecture == "x86_64", 17, 1))
end
end

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

@ -1019,7 +1019,7 @@
if cfg.flags.Symbols then
if cfg.debugformat == "c7" then
value = "OldStyle"
elseif cfg.architecture == "x64" or
elseif cfg.architecture == "x86_64" or
cfg.clr ~= p.OFF or
config.isOptimizedBuild(cfg) or
not cfg.editAndContinue

4
src/base/_foundation.lua
View File

@ -40,8 +40,8 @@
premake.UTILITY = "Utility"
premake.WINDOWEDAPP = "WindowedApp"
premake.WINDOWS = "windows"
premake.X32 = "x32"
premake.X64 = "x64"
premake.X86 = "x86"
premake.X86_64 = "x86_64"
premake.XBOX360 = "xbox360"

4
src/tools/clang.lua
View File

@ -152,8 +152,8 @@
clang.ldflags = {
architecture = {
x32 = "-m32",
x64 = "-m64",
x86 = "-m32",
x86_64 = "-m64",
},
kind = {
SharedLib = function(cfg)

12
src/tools/gcc.lua
View File

@ -34,8 +34,8 @@
gcc.cflags = {
architecture = {
x32 = "-m32",
x64 = "-m64",
x86 = "-m32",
x86_64 = "-m64",
},
flags = {
FatalCompileWarnings = "-Werror",
@ -181,8 +181,8 @@
gcc.ldflags = {
architecture = {
x32 = "-m32",
x64 = "-m64",
x86 = "-m32",
x86_64 = "-m64",
},
flags = {
_Symbols = function(cfg)
@ -220,8 +220,8 @@
gcc.libraryDirectories = {
architecture = {
x32 = "-L/usr/lib32",
x64 = "-L/usr/lib64",
x86 = "-L/usr/lib32",
x86_64 = "-L/usr/lib64",
},
system = {
wii = "-L$(LIBOGC_LIB)",

4
tests/actions/vstudio/cs2005/test_platform_groups.lua
View File

@ -72,7 +72,7 @@
end
function suite.onX32()
prepare("x32")
prepare("x86")
test.capture [[
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@ -81,7 +81,7 @@
function suite.onX64()
prepare("x64")
prepare("x86_64")
test.capture [[
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<PlatformTarget>x64</PlatformTarget>

28
tests/actions/vstudio/sln2005/test_platforms.lua
View File

@ -192,7 +192,7 @@
function suite.onSingleCpp_noPlatforms_singleArch()
project "MyProject"
architecture "x64"
architecture "x86_64"
prepare()
test.capture [[
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -210,7 +210,7 @@
function suite.onSingleCs_noPlatforms_singleArch()
project "MyProject"
architecture "x64"
architecture "x86_64"
prepare()
test.capture [[
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -227,7 +227,7 @@
end
function suite.onMixedLanguage_noPlatforms_singleArch()
architecture "x64"
architecture "x86_64"
project "MyProject1"
language "C#"
@ -264,7 +264,7 @@
uuid "52AD9329-0D74-4F66-A213-E649D8CCD737"
project "MyProject2"
architecture "x64"
architecture "x86_64"
prepare()
test.capture [[
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -290,7 +290,7 @@
--
function suite.onSingleCpp_noPlatforms_x32()
architecture "x32"
architecture "x86"
project "MyProject"
prepare()
test.capture [[
@ -308,7 +308,7 @@
end
function suite.onSingleCs_noPlatforms_x32()
architecture "x32"
architecture "x86"
project "MyProject"
language "C#"
prepare()
@ -327,7 +327,7 @@
end
function suite.onMixedLanguage_noPlatforms_x32()
architecture "x32"
architecture "x86"
project "MyProject1"
language "C#"
@ -361,9 +361,9 @@
function suite.onSingleCpp_withPlatforms_withArchs()
platforms { "DLL32", "DLL64" }
filter "platforms:DLL32"
architecture "x32"
architecture "x86"
filter "platforms:DLL64"
architecture "x64"
architecture "x86_64"
project "MyProject"
prepare()
@ -390,9 +390,9 @@
function suite.onSingleCs_withPlatforms_withArchs()
platforms { "DLL32", "DLL64" }
filter "platforms:DLL32"
architecture "x32"
architecture "x86"
filter "platforms:DLL64"
architecture "x64"
architecture "x86_64"
project "MyProject"
language "C#"
@ -420,9 +420,9 @@
function suite.onMixedLanguage_withPlatforms_withArchs()
platforms { "DLL32", "DLL64" }
filter "platforms:DLL32"
architecture "x32"
architecture "x86"
filter "platforms:DLL64"
architecture "x64"
architecture "x86_64"
project "MyProject1"
language "C#"
@ -809,4 +809,4 @@
Release|Win32 = Release|Win32
EndGlobalSection
]]
end
end

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

@ -551,7 +551,7 @@
function suite.debugFormat_onWin32()
flags "Symbols"
architecture "x32"
architecture "x86"
prepare()
test.capture [[
<ClCompile>
@ -568,7 +568,7 @@
function suite.debugFormat_onWin64()
flags "Symbols"
architecture "x64"
architecture "x86_64"
prepare()
test.capture [[
<ClCompile>

4
tests/actions/vstudio/vc2010/test_project_configs.lua
View File

@ -55,9 +55,9 @@
function suite.allArchitecturesListed_onMultipleArchitectures()
platforms { "32b", "64b" }
filter "platforms:32b"
architecture "x32"
architecture "x86"
filter "platforms:64b"
architecture "x64"
architecture "x86_64"
prepare()
test.capture [[
<ItemGroup Label="ProjectConfigurations">

14
tests/project/test_getconfig.lua
View File

@ -92,10 +92,10 @@
--
function suite.setsArchitecture_onMatchingPlatform()
platforms { "x32", "x64" }
platforms { "x86", "x64" }
project ("MyProject")
prepare("Debug", "x32")
test.isequal("x32", cfg.architecture)
prepare("Debug", "x86")
test.isequal("x86", cfg.architecture)
end
@ -105,9 +105,9 @@
--
function suite.doesNotOverride_onMatchingPlatform()
platforms { "x32", "x64" }
platforms { "x86", "x64" }
project ("MyProject")
architecture "x64"
prepare("Debug", "x32")
test.isequal("x64", cfg.architecture)
architecture "x86_64"
prepare("Debug", "x86")
test.isequal("x86_64", cfg.architecture)
end

8
tests/tools/test_gcc.lua
View File

@ -276,25 +276,25 @@
--
function suite.cflags_onX32()
architecture "x32"
architecture "x86"
prepare()
test.contains({ "-m32" }, gcc.getcflags(cfg))
end
function suite.ldflags_onX32()
architecture "x32"
architecture "x86"
prepare()
test.contains({ "-m32" }, gcc.getldflags(cfg))
end
function suite.cflags_onX64()
architecture "x64"
architecture "x86_64"
prepare()
test.contains({ "-m64" }, gcc.getcflags(cfg))
end
function suite.ldflags_onX64()
architecture "x64"
architecture "x86_64"
prepare()
test.contains({ "-m64" }, gcc.getldflags(cfg))
end