diff options
| author | ruki <[email protected]> | 2020-09-21 11:16:53 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-21 11:16:53 +0800 |
| commit | 210974e9f6482597253e314f976c8c207d899d76 (patch) | |
| tree | 53fc2e3a49b91c006adff34a7e6e4379bdf5f633 /tests/projects | |
| parent | 151998405503c71004ef7e6642c6d2dbd94fd39b (diff) | |
| parent | efaa9772486494e755f962accb9e4d828812b0c2 (diff) | |
Merge pull request #959 from xmake-io/luajit-v2.1
update to luajit v2.1/master and support armv7/mips64
Diffstat (limited to 'tests/projects')
| -rw-r--r-- | tests/projects/c/Unicode 测试/test.lua | bin | 144 -> 354 bytes | |||
| -rw-r--r-- | tests/projects/other/merge_object/xmake.lua | 16 |
2 files changed, 1 insertions, 15 deletions
diff --git a/tests/projects/c/Unicode 测试/test.lua b/tests/projects/c/Unicode 测试/test.lua Binary files differindex 53d97c80b..fecba70e1 100644 --- a/tests/projects/c/Unicode 测试/test.lua +++ b/tests/projects/c/Unicode 测试/test.lua diff --git a/tests/projects/other/merge_object/xmake.lua b/tests/projects/other/merge_object/xmake.lua index 8e634b03c..b8799a0b8 100644 --- a/tests/projects/other/merge_object/xmake.lua +++ b/tests/projects/other/merge_object/xmake.lua @@ -1,30 +1,16 @@ --- add rules add_rules("mode.debug", "mode.release") +set_policy("build.across_targets_in_parallel", false) --- add target target("merge_object") - - -- set kind set_kind("static") - - -- add files add_files("src/interface.c") - - -- save object file after_build_file(function (target, sourcefile) os.cp(target:objectfile(sourcefile), "$(buildir)/merge_object/") end) --- add target target("test") - - -- set kind set_kind("binary") - - -- add deps add_deps("merge_object") - - -- add files add_files("src/test.c") if is_plat("windows") then add_files("$(buildir)/merge_object/interface.c.obj") |