diff options
author | 2019-09-29 15:30:18 +0200 | |
---|---|---|
committer | 2019-09-29 09:30:18 -0400 | |
commit | ed2b7e5ef1626c0d6318b6ea71897efbb4356277 (patch) | |
tree | 62a84a4a2c804922839dbfa60ec664b84beaaee0 /3rdparty/genie/src/base/project.lua | |
parent | 1bd1288c9e17bdba9544d1e56be7618106fece7e (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/base/project.lua')
-rw-r--r-- | 3rdparty/genie/src/base/project.lua | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/3rdparty/genie/src/base/project.lua b/3rdparty/genie/src/base/project.lua index 1fc7375e93e..1c817c4168c 100644 --- a/3rdparty/genie/src/base/project.lua +++ b/3rdparty/genie/src/base/project.lua @@ -506,7 +506,7 @@ ext = ".lib" end elseif namestyle == "posix" then - if kind == "WindowedApp" and system == "macosx" then + if kind == "WindowedApp" and system == "macosx" and not cfg.options.SkipBundling then bundlename = name .. ".app" bundlepath = path.join(dir, bundlename) dir = path.join(bundlepath, "Contents/MacOS") @@ -535,6 +535,34 @@ elseif kind == "SharedLib" then ext = ".prx" end + elseif namestyle == "TegraAndroid" then + -- the .so->.apk happens later for Application types + if kind == "ConsoleApp" or kind == "WindowedApp" or kind == "SharedLib" then + prefix = "lib" + ext = ".so" + elseif kind == "StaticLib" then + prefix = "lib" + ext = ".a" + end + elseif namestyle == "NX" then + -- NOTE: it would be cleaner to just output $(TargetExt) for all cases, but + -- there is logic elsewhere that assumes a '.' to be present in target name + -- such that it can reverse engineer the extension set here. + if kind == "ConsoleApp" or kind == "WindowedApp" then + ext = ".nspd_root" + elseif kind == "StaticLib" then + ext = ".a" + elseif kind == "SharedLib" then + ext = ".nro" + end + elseif namestyle == "Emscripten" then + if kind == "ConsoleApp" or kind == "WindowedApp" then + ext = ".html" + elseif kind == "StaticLib" then + ext = ".bc" + elseif kind == "SharedLib" then + ext = ".js" + end end prefix = cfg[field.."prefix"] or cfg.targetprefix or prefix |