diff options
| author | ruki <[email protected]> | 2016-05-24 09:50:37 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-05-24 09:50:37 +0800 |
| commit | 60d98ff138aa87bcd15c16c266c2ffcf841ee47f (patch) | |
| tree | 371f8c4c7a4554e7fb5d3f71f13a64bd790ff0ad /tests | |
| parent | a1a5a8b7bf0e8b5e809bb03c72c4e5e0784dd39e (diff) | |
impl merge object
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/merge_object/xmake.lua | 2 | ||||
| -rwxr-xr-x | tests/tests | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/merge_object/xmake.lua b/tests/merge_object/xmake.lua index a17d5f6d0..6be5eff44 100755 --- a/tests/merge_object/xmake.lua +++ b/tests/merge_object/xmake.lua @@ -41,5 +41,5 @@ target("test") -- add files add_files("src/test.c") - add_files("src/interface.o") + add_files("build/.objs/merge_object/src/interface.o") diff --git a/tests/tests b/tests/tests index a948eb60f..d731cccc9 100755 --- a/tests/tests +++ b/tests/tests @@ -58,7 +58,7 @@ build "./tests/static_library_c++" build "./tests/shared_library_c++" # merge object -#build "./tests/merge_object" +build "./tests/merge_object" # merge static library #build "./tests/merge_static_library" |
