diff options
| author | ruki <[email protected]> | 2024-01-26 23:01:44 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-26 23:01:44 +0800 |
| commit | fd85ae0a81de712ca3837b262e936fd67b8f483f (patch) | |
| tree | 97894c8d36a17ca6437aedd10400b8f24574d783 /tests/projects | |
| parent | 042362f4c3f1dab8b6b5a32fcbbae20e66e224de (diff) | |
| parent | 2a43a89241ff5044661fa7449d6455386cd3a449 (diff) | |
Merge pull request #4630 from xmake-io/runtimes
Improve runtimes to support libc++/libstdc++
Diffstat (limited to 'tests/projects')
| -rw-r--r-- | tests/projects/package/components/xmake.lua | 2 | ||||
| -rw-r--r-- | tests/projects/package/depconfigs/xmake.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/projects/package/components/xmake.lua b/tests/projects/package/components/xmake.lua index 6185f5178..14dbe472d 100644 --- a/tests/projects/package/components/xmake.lua +++ b/tests/projects/package/components/xmake.lua @@ -175,7 +175,7 @@ package("sfml") table.insert(configs, "-DBUILD_SHARED_LIBS=ON") else table.insert(configs, "-DBUILD_SHARED_LIBS=OFF") - if package:is_plat("windows") and package:config("vs_runtime"):startswith("MT") then + if package:is_plat("windows") and package:runtimes():startswith("MT") then table.insert(configs, "-DSFML_USE_STATIC_STD_LIBS=ON") end end diff --git a/tests/projects/package/depconfigs/xmake.lua b/tests/projects/package/depconfigs/xmake.lua index 377c8899b..11623755c 100644 --- a/tests/projects/package/depconfigs/xmake.lua +++ b/tests/projects/package/depconfigs/xmake.lua @@ -1,5 +1,5 @@ -add_requires("libpng", {system = false, configs = {vs_runtime = "MD"}}) -add_requires("libtiff", {system = false, configs = {vs_runtime = "MD", zlib = true}}) +add_requires("libpng", {system = false, configs = {runtimes = "MD"}}) +add_requires("libtiff", {system = false, configs = {runtimes = "MD", zlib = true}}) add_requireconfs("libpng.zlib", {system = false, override = true, configs = {cxflags = "-DTEST1"}, version = "1.2.10"}) add_requireconfs("libtiff.*|cmake", {system = false, configs = {cxflags = "-DTEST2"}}) |