diff options
| author | ruki <[email protected]> | 2018-04-21 22:47:28 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-04-21 22:47:28 +0800 |
| commit | e189adce6d8d836e6b8aecf43f10f1cff3949c79 (patch) | |
| tree | 88bf008d93ef4f189e7978cf0bf10fa6caeb9af7 | |
| parent | 40880ecda5cc964fdfd97539c4272eb447dcd0c2 (diff) | |
fix travis-ci bug
| -rw-r--r-- | core/src/demo/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/platforms/windows/xmake.lua | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua index e373e53f3..3184c0240 100644 --- a/core/src/demo/xmake.lua +++ b/core/src/demo/xmake.lua @@ -38,4 +38,8 @@ target("demo") add_links("pthread", "dl", "m", "c") end + -- copy target to the build directory + after_build(function (target) + os.cp(target:targetfile(), "$(buildir)") + end) diff --git a/xmake/platforms/windows/xmake.lua b/xmake/platforms/windows/xmake.lua index 8a6501d13..516209a70 100644 --- a/xmake/platforms/windows/xmake.lua +++ b/xmake/platforms/windows/xmake.lua @@ -83,17 +83,21 @@ platform("windows") set_menu { config = { - {category = "Visual Studio SDK Configuration" } - , {nil, "vs", "kv", "auto", "The Microsoft Visual Studio" } - , {category = "Cuda SDK Configuration" } - , {nil, "cuda", "kv", "auto", "The Cuda SDK Directory" } + {category = "Visual Studio SDK Configuration" } + , {nil, "vs", "kv", "auto", "The Microsoft Visual Studio" } + , {category = "Cuda SDK Configuration" } + , {nil, "cuda", "kv", "auto", "The Cuda SDK Directory" } + , {category = "Qt SDK Configuration" } + , {nil, "qt", "kv", "auto", "The Qt SDK Directory" } + , {nil, "qt_sdkver","kv", "auto", "The Qt SDK Version" } } , global = { - { } - , {nil, "vs", "kv", "auto", "The Microsoft Visual Studio" } - , {nil, "cuda", "kv", "auto", "The Cuda SDK Directory" } + { } + , {nil, "vs", "kv", "auto", "The Microsoft Visual Studio" } + , {nil, "cuda", "kv", "auto", "The Cuda SDK Directory" } + , {nil, "qt", "kv", "auto", "The Qt SDK Directory" } } } |