summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-01-22 09:00:21 +0800
committerruki <[email protected]>2017-01-22 09:00:21 +0800
commit10da1cf992e93db403d49bc5854fa6d88e452ab7 (patch)
tree2f9b3f0e7889c16b34c31e37c75c3d220effced1
parent43c75eaea996ac463f1fd6cdf042216b37c92dba (diff)
add set_sourceflags api for language
-rw-r--r--xmake/core/language/language.lua1
-rwxr-xr-xxmake/languages/asm/xmake.lua3
-rwxr-xr-xxmake/languages/c++/xmake.lua3
-rwxr-xr-xxmake/languages/golang/xmake.lua3
-rwxr-xr-xxmake/languages/objc++/xmake.lua3
-rwxr-xr-xxmake/languages/swift/xmake.lua3
6 files changed, 16 insertions, 0 deletions
diff --git a/xmake/core/language/language.lua b/xmake/core/language/language.lua
index 82d9182a9..b95bfdb10 100644
--- a/xmake/core/language/language.lua
+++ b/xmake/core/language/language.lua
@@ -169,6 +169,7 @@ function language._interpreter()
{
-- language.set_xxx
"language.set_sourcekinds"
+ , "language.set_sourceflags"
}
}
diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua
index e89eadbed..a630a42c3 100755
--- a/xmake/languages/asm/xmake.lua
+++ b/xmake/languages/asm/xmake.lua
@@ -28,6 +28,9 @@ language("asm")
-- set source file kinds
set_sourcekinds {as = {".s", ".asm"}}
+ -- set source file flags
+ set_sourceflags {as = "asflags"}
+
-- set target kinds
set_targetkinds("binary", "static", "shared")
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua
index 8a94e9b6e..03c8a0c3a 100755
--- a/xmake/languages/c++/xmake.lua
+++ b/xmake/languages/c++/xmake.lua
@@ -28,6 +28,9 @@ language("c++")
-- set source file kinds
set_sourcekinds {cc = ".c", cxx = {".cc", ".cpp", ".cxx"}}
+ -- set source file flags
+ set_sourceflags {cc = {"cflags", "cxflags"}, cxx = {"cxxflags", "cxflags"}}
+
-- set target kinds
set_targetkinds("binary", "static", "shared")
diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua
index bac49e680..d15961df8 100755
--- a/xmake/languages/golang/xmake.lua
+++ b/xmake/languages/golang/xmake.lua
@@ -28,6 +28,9 @@ language("golang")
-- set source file kinds
set_sourcekinds {go = ".go"}
+ -- set source file flags
+ set_sourceflags {go = "goflags"}
+
-- set target kinds
set_targetkinds("binary", "static", "shared")
diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua
index 9ff269372..a06010f8b 100755
--- a/xmake/languages/objc++/xmake.lua
+++ b/xmake/languages/objc++/xmake.lua
@@ -28,6 +28,9 @@ language("objc++")
-- set source file kinds
set_sourcekinds {mm = ".m", mxx = ".mm"}
+ -- set source file flags
+ set_sourceflags {mm = {"mflags", "mxflags"}, mxx = {"mxxflags", "mxflags"}}
+
-- set target kinds
set_targetkinds("binary", "static", "shared")
diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua
index 644d2d6d8..8cb67a850 100755
--- a/xmake/languages/swift/xmake.lua
+++ b/xmake/languages/swift/xmake.lua
@@ -28,6 +28,9 @@ language("swift")
-- set source file kinds
set_sourcekinds {sc = ".swift"}
+ -- set source file flags
+ set_sourceflags {sc = "scflags"}
+
-- set target kinds
set_targetkinds("binary")