summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/genie/src/actions/xcode/_xcode.lua
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-09-29 15:30:18 +0200
committer R. Belmont <rb6502@users.noreply.github.com>2019-09-29 09:30:18 -0400
commited2b7e5ef1626c0d6318b6ea71897efbb4356277 (patch)
tree62a84a4a2c804922839dbfa60ec664b84beaaee0 /3rdparty/genie/src/actions/xcode/_xcode.lua
parent1bd1288c9e17bdba9544d1e56be7618106fece7e (diff)
Synced with GENie upstream revision e78d6c1 (#5631)
* Synced with GENie upstream revision e78d6c1 * Add Visual Studio 2019 support * Fix hardcoded -m64 * Switch appveyor to Visual Studio 2019 * Fix genie being built as 32-bit * MSVC build is known to be broken currently. Let it fail until all the known issues are fixed. * Update the packages before building * Build with 3 threads Appveyor VMs have only 2 cores and 8 GB RAM. * Enable caching of pacman cache
Diffstat (limited to '3rdparty/genie/src/actions/xcode/_xcode.lua')
-rw-r--r--3rdparty/genie/src/actions/xcode/_xcode.lua88
1 files changed, 1 insertions, 87 deletions
diff --git a/3rdparty/genie/src/actions/xcode/_xcode.lua b/3rdparty/genie/src/actions/xcode/_xcode.lua
index f14e8d7300e..406486f796a 100644
--- a/3rdparty/genie/src/actions/xcode/_xcode.lua
+++ b/3rdparty/genie/src/actions/xcode/_xcode.lua
@@ -5,8 +5,6 @@
--
premake.xcode = { }
- premake.xcode.xcode6 = { }
-
--
-- Verify only single target kind for Xcode project
@@ -15,7 +13,7 @@
-- Project to be analyzed
--
- local function checkproject(prj)
+ function premake.xcode.checkproject(prj)
-- Xcode can't mix target kinds within a project
local last
for cfg in premake.eachconfig(prj) do
@@ -31,87 +29,3 @@
--
premake.xcode.toolset = "macosx"
-
- newaction
- {
- trigger = "xcode3",
- shortname = "Xcode 3",
- description = "Generate Apple Xcode 3 project files (experimental)",
- os = "macosx",
-
- valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
-
- valid_languages = { "C", "C++" },
-
- valid_tools = {
- cc = { "gcc" },
- },
-
- valid_platforms = {
- Native = "Native",
- x32 = "Native 32-bit",
- x64 = "Native 64-bit",
- Universal32 = "32-bit Universal",
- Universal64 = "64-bit Universal",
- Universal = "Universal",
- },
-
- default_platform = "Universal",
-
- onsolution = function(sln)
- -- Assign IDs needed for inter-project dependencies
- premake.xcode.preparesolution(sln)
- end,
-
- onproject = function(prj)
- premake.generate(prj, "%%.xcodeproj/project.pbxproj", premake.xcode.project)
- end,
-
- oncleanproject = function(prj)
- premake.clean.directory(prj, "%%.xcodeproj")
- end,
-
- oncheckproject = checkproject,
- }
-
- newaction
- {
- trigger = "xcode4",
- shortname = "Xcode 4",
- description = "Generate Apple Xcode 4 project files (experimental)",
- os = "macosx",
-
- valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
-
- valid_languages = { "C", "C++" },
-
- valid_tools = {
- cc = { "gcc" },
- },
-
- valid_platforms = {
- Native = "Native",
- x32 = "Native 32-bit",
- x64 = "Native 64-bit",
- Universal32 = "32-bit Universal",
- Universal64 = "64-bit Universal",
- Universal = "Universal",
- },
-
- default_platform = "Universal",
-
- onsolution = function(sln)
- premake.generate(sln, "%%.xcworkspace/contents.xcworkspacedata", premake.xcode4.workspace_generate)
- end,
-
- onproject = function(prj)
- premake.generate(prj, "%%.xcodeproj/project.pbxproj", premake.xcode.project)
- end,
-
- oncleanproject = function(prj)
- premake.clean.directory(prj, "%%.xcodeproj")
- premake.clean.directory(prj, "%%.xcworkspace")
- end,
-
- oncheckproject = checkproject,
- }