diff --git a/tests/cpp-empty-test/.cocos-project.json b/tests/cpp-empty-test/.cocos-project.json index e5141c596c..a85785528b 100644 --- a/tests/cpp-empty-test/.cocos-project.json +++ b/tests/cpp-empty-test/.cocos-project.json @@ -3,7 +3,8 @@ "project_path": "../../build", "sln_file": "cocos2d-win32.sln", "project_name": "cpp-empty-test", - "build_cfg_path": "proj.win32" + "build_cfg_path": "proj.win32", + "exe_out_dir": "cpp-empty-test" }, "linux_cfg": { "project_path": "proj.linux", diff --git a/tests/cpp-tests/.cocos-project.json b/tests/cpp-tests/.cocos-project.json index d55bdbb61f..43ef771856 100644 --- a/tests/cpp-tests/.cocos-project.json +++ b/tests/cpp-tests/.cocos-project.json @@ -3,7 +3,8 @@ "project_path": "../../build", "sln_file": "cocos2d-win32.sln", "project_name": "cpp-tests", - "build_cfg_path": "proj.win32" + "build_cfg_path": "proj.win32", + "exe_out_dir": "cpp-tests" }, "linux_cfg": { "project_path": "proj.linux", diff --git a/tests/js-tests/.cocos-project.json b/tests/js-tests/.cocos-project.json index fcda0699e6..dcabb7357a 100644 --- a/tests/js-tests/.cocos-project.json +++ b/tests/js-tests/.cocos-project.json @@ -5,7 +5,8 @@ "project_path": "../../build", "sln_file": "cocos2d-js-win32.sln", "project_name": "js-tests", - "build_cfg_path": "project/proj.win32" + "build_cfg_path": "project/proj.win32", + "exe_out_dir": "js-tests" }, "ios_cfg": { "project_path": "../../build", diff --git a/tests/lua-empty-test/.cocos-project.json b/tests/lua-empty-test/.cocos-project.json index e495b4f878..e080d9118a 100644 --- a/tests/lua-empty-test/.cocos-project.json +++ b/tests/lua-empty-test/.cocos-project.json @@ -3,7 +3,8 @@ "project_path": "../../build", "sln_file": "cocos2d-win32.sln", "project_name": "lua-empty-test", - "build_cfg_path": "project/proj.win32" + "build_cfg_path": "project/proj.win32", + "exe_out_dir": "lua-empty-test" }, "linux_cfg": { "project_path": "project/proj.linux", diff --git a/tests/lua-tests/.cocos-project.json b/tests/lua-tests/.cocos-project.json index 4d6ef9e44a..f40701587a 100644 --- a/tests/lua-tests/.cocos-project.json +++ b/tests/lua-tests/.cocos-project.json @@ -3,7 +3,8 @@ "project_path": "../../build", "sln_file": "cocos2d-win32.sln", "project_name": "lua-tests", - "build_cfg_path": "project/proj.win32" + "build_cfg_path": "project/proj.win32", + "exe_out_dir": "lua-tests" }, "linux_cfg": { "project_path": "project/proj.linux", diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 24ff2f151e..79d220cb05 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 24ff2f151e6ebdb6cd94ce4157cb00983f911958 +Subproject commit 79d220cb052372cde4868b6d0cc332a89e4fbc03