Skip to content
This repository was archived by the owner on Jun 2, 2019. It is now read-only.

Updated to be compatible with alpha12 #2

Open
samsinsane wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to be compatible with alpha12 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 48 additions & 55 deletions _preload.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
-- Copyright: (c) 2013-2015 Manu Evans and the Premake project
--

require "vstudio"

local p = premake
local api = p.api

Expand All @@ -16,12 +18,13 @@
p.ANDROIDPROJ = "androidproj"

api.addAllowed("system", p.ANDROID)
api.addAllowed("architecture", { "armv5", "armv7", "aarach64", "mips", "mips64", "arm" })
api.addAllowed("architecture", { "armv5", "armv7", "aarach64", "mips", "mips64", "arm", "arm64" })
api.addAllowed("vectorextensions", { "NEON", "MXU" })
api.addAllowed("flags", { "Thumb" })
api.addAllowed("kind", p.ANDROIDPROJ)

premake.action._list["vs2015"].valid_kinds = table.join(premake.action._list["vs2015"].valid_kinds, { p.ANDROIDPROJ })
premake.action._list["vs2017"].valid_kinds = table.join(premake.action._list["vs2017"].valid_kinds, { p.ANDROIDPROJ })

-- TODO: can I api.addAllowed() a key-value pair?
local os = p.fields["os"];
Expand Down Expand Up @@ -51,62 +54,52 @@
kind = "integer",
}

if _ACTION >= "vs2015" then
api.register {
name = "toolchainversion",
scope = "config",
kind = "string",
allowed = {
"4.9", -- NDK GCC versions
"3.6", -- NDK clang versions
},
}
else
api.register {
name = "toolchainversion",
scope = "config",
kind = "string",
allowed = {
"4.6", -- NDK GCC versions
"4.8",
"4.9",
"3.4", -- NDK clang versions
"3.5",
"3.6",
},
api.register {
name = "androidprojectversion",
scope = "config",
kind = "string",
allowed = {
"1.0",
"2.0",
"3.0",
}
end
}

if _ACTION >= "vs2015" then
api.register {
name = "stl",
scope = "config",
kind = "string",
allowed = {
"minimal c++ (system)",
"c++ static",
"c++ shared",
"stlport static",
"stlport shared",
"gnu stl static",
"gnu stl shared",
"llvm libc++ static",
"llvm libc++ shared",
},
}
else
api.register {
name = "stl",
scope = "config",
kind = "string",
allowed = {
"none",
"minimal",
"stdc++",
"stlport",
},
}
end
api.register {
name = "toolchainversion",
scope = "config",
kind = "string",
allowed = function (value)
-- Warn the user of a known invalid option
if _ACTION < "vs2015" then
if (value >= "4.6" and value <= "4.9") or (value >= "3.4" and value <= "3.6") then
p.warn("The provided value might not be supported!")
end
end

-- Don't limit the value arbitrarily as the available options
-- change between implementations
return value
end,
}

api.register {
name = "stl",
scope = "config",
kind = "string",
allowed = {
"none",
"minimal",
"c++",
"stlport",
"gnu stl",
"stdc++",
"llvm libc++",
},
aliases = {
["stdc++"] = "gnu stl",
},
}

api.register {
name = "thumbmode",
Expand Down
82 changes: 61 additions & 21 deletions vsandroid_vcxproj.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
if vstudio.vs2010_architectures ~= nil then
if _ACTION >= "vs2015" then
vstudio.vs2010_architectures.arm = "ARM"
vstudio.vs2010_architectures.arm64 = "ARM64"
else
vstudio.vs2010_architectures.android = "Android"
end
Expand Down Expand Up @@ -51,7 +52,7 @@
_p(2, "<RootNamespace>%s</RootNamespace>", cfg.project.name)
_p(2, "<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>")
_p(2, "<ApplicationType>Android</ApplicationType>")
_p(2, "<ApplicationTypeRevision>1.0</ApplicationTypeRevision>")
_p(2, "<ApplicationTypeRevision>%s</ApplicationTypeRevision>", cfg.androidprojectversion or iif(_ACTION == "vs2017", "3.0", "1.0"))
end

--
Expand Down Expand Up @@ -84,30 +85,44 @@
function android.androidStlType(cfg)
if cfg.stl ~= nil then
if _ACTION >= "vs2015" then
local stlType = {
["minimal c++ (system)"] = "system",
["c++ static"] = "gabi++_static",
["c++ shared"] = "gabi++_shared",
["stlport static"] = "stlport_static",
["stlport shared"] = "stlport_shared",
["gnu stl static"] = "gnustl_static",
["gnu stl shared"] = "gnustl_shared",
["llvm libc++ static"] = "c++_static",
["llvm libc++ shared"] = "c++_shared",
local static = {
["none"] = nil,
["minimal"] = "system",
["c++"] = "gabi++_static",
["stlport"] = "stlport_static",
["gnu stl"] = "gnustl_static",
["llvm libc++"] = "c++_static",
}
local dynamic = {
["none"] = nil,
["minimal"] = "system",
["c++"] = "gabi++_shared",
["stlport"] = "stlport_shared",
["gnu stl"] = "gnustl_shared",
["llvm libc++"] = "c++_shared",
}
_p(2,'<UseOfStl>%s</UseOfStl>', stlType[cfg.stl])
local stl = iif(cfg.flags.StaticRuntime, static, dynamic);
_p(2,'<UseOfStl>%s</UseOfStl>', stl[cfg.stl])
else
local static = {
none = "none",
minimal = "system",
["stdc++"] = "gnustl_static",
stlport = "stlport_static",
["none"] = "none",
["minimal"] = "system",
["gnu stl"] = "gnustl_static",
["stlport"] = "stlport_static",

-- Translate others to something else
["c++"] = "gnustl_static",
["llvm libc++"] = "gnustl_static",
}
local dynamic = {
none = "none",
minimal = "system",
["stdc++"] = "gnustl_dynamic",
stlport = "stlport_dynamic",
["none"] = "none",
["minimal"] = "system",
["gnu stl"] = "gnustl_dynamic",
["stlport"] = "stlport_dynamic",

-- Translate others to something else
["c++"] = "gnustl_dynamic",
["llvm libc++"] = "gnustl_dynamic",
}
local stl = iif(cfg.flags.StaticRuntime, static, dynamic);
_p(2,'<AndroidStlType>%s</AndroidStlType>', stl[cfg.stl])
Expand Down Expand Up @@ -195,6 +210,7 @@
table.remove(elements, table.indexof(elements, vc2010.debugInformationFormat))
table.remove(elements, table.indexof(elements, android.thumbMode))
elements = table.join(elements, {
android.cStandard,
android.cppStandard,
})
end
Expand Down Expand Up @@ -234,9 +250,33 @@
-- end
end

function android.cStandard(cfg)
if cfg.cppdialect == "C89" then
_p(3, '<CLanguageStandard>c89</CLanguageStandard>')
elseif cfg.cppdialect == "C99" then
_p(3, '<CLanguageStandard>c99</CLanguageStandard>')
elseif cfg.cppdialect == "C11" then
_p(3, '<CLanguageStandard>c11</CLanguageStandard>')
elseif cfg.cppdialect == "gnu99" then
_p(3, '<CLanguageStandard>gnu99</CLanguageStandard>')
elseif cfg.cppdialect == "gnu11" then
_p(3, '<CLanguageStandard>gnu11</CLanguageStandard>')
end
end

function android.cppStandard(cfg)
if cfg.flags["C++11"] then
if cfg.cppdialect == "C++98" then
_p(3, '<CppLanguageStandard>c++98</CppLanguageStandard>')
elseif cfg.cppdialect == "C++11" then
_p(3, '<CppLanguageStandard>c++11</CppLanguageStandard>')
elseif cfg.cppdialect == "C++14" then
_p(3, '<CppLanguageStandard>c++1y</CppLanguageStandard>')
elseif cfg.cppdialect == "gnu++98" then
_p(3, '<CppLanguageStandard>gnu++98</CppLanguageStandard>')
elseif cfg.cppdialect == "gnu++11" then
_p(3, '<CppLanguageStandard>gnu++11</CppLanguageStandard>')
elseif cfg.cppdialect == "gnu++14" then
_p(3, '<CppLanguageStandard>gnu++1y</CppLanguageStandard>')
end
end

Expand Down