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/path.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/path.lua')
-rw-r--r-- | 3rdparty/genie/src/base/path.lua | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/3rdparty/genie/src/base/path.lua b/3rdparty/genie/src/base/path.lua index c017ff7822b..ae2561ac07e 100644 --- a/3rdparty/genie/src/base/path.lua +++ b/3rdparty/genie/src/base/path.lua @@ -157,7 +157,7 @@ end function path.iscppfile(fname) - return path.hasextension(fname, { ".cc", ".cpp", ".cxx", ".c", ".m", ".mm" }) + return path.hasextension(fname, { ".cc", ".cpp", ".cxx", ".c++", ".c", ".m", ".mm" }) end function path.iscxfile(fname) @@ -176,6 +176,10 @@ return path.hasextension(fname, ".appxmanifest") end + function path.isandroidbuildfile(fname) + return path.getname(fname) == "AndroidManifest.xml" + end + function path.isnatvis(fname) return path.hasextension(fname, ".natvis") end @@ -202,11 +206,20 @@ end function path.issourcefilevs(fname) - return path.hasextension(fname, { ".cc", ".cpp", ".cxx", ".c" }) + return path.hasextension(fname, { ".cc", ".cpp", ".cxx", ".c++", ".c" }) or path.iscxfile(fname) end -- +-- Returns true if the filename represents a compiled object file. This check +-- is used to support object files in the "files" list for archiving. +-- + + function path.isobjectfile(fname) + return path.hasextension(fname, { ".o", ".obj" }) + end + +-- -- Returns true if the filename represents a Windows resource file. This check -- is used to prevent passing non-resources to the compiler in makefiles. -- |