summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-09-04 22:29:54 +0800
committerruki <[email protected]>2019-09-04 08:59:25 +0800
commit2abe0ac3e71743147c433e0b901eaf3d244ef099 (patch)
tree66868f9aab43136d857568c6d9dc08dda4d7c9f7
parent99a276b2f670ebd56ccbc1cadc0732dc464db383 (diff)
fix ci errors
-rw-r--r--tests/projects/hybrid/static_library/src/main.cpp2
-rw-r--r--tests/projects/hybrid/static_library/xmake.lua7
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/projects/hybrid/static_library/src/main.cpp b/tests/projects/hybrid/static_library/src/main.cpp
index 2750fcf2c..2e70301ce 100644
--- a/tests/projects/hybrid/static_library/src/main.cpp
+++ b/tests/projects/hybrid/static_library/src/main.cpp
@@ -4,7 +4,9 @@ int main(int argc, char** argv)
{
test1();
test2();
+#ifdef MACOSX
test3();
test4();
+#endif
return 0;
}
diff --git a/tests/projects/hybrid/static_library/xmake.lua b/tests/projects/hybrid/static_library/xmake.lua
index 75d01d3b1..bc382c7c3 100644
--- a/tests/projects/hybrid/static_library/xmake.lua
+++ b/tests/projects/hybrid/static_library/xmake.lua
@@ -3,12 +3,17 @@ add_rules("mode.release", "mode.debug")
target("test")
set_kind("static")
add_files("src/*.c", "src/*.cpp")
- add_files("src/*.m", "src/*.mm")
+ if is_plat("macosx") then
+ add_files("src/*.m", "src/*.mm")
+ end
target("demo")
set_kind("binary")
add_deps("test")
add_files("src/main.cpp")
+ if is_plat("macosx") then
+ add_defines("MACOSX")
+ end
target("demo2")
set_kind("binary")