From 5e1dc33a5535817b3a3b29f444117a66dbad3a48 Mon Sep 17 00:00:00 2001 From: leda Date: Mon, 12 Nov 2018 21:27:16 +0800 Subject: [PATCH 1/9] re-target on wi10 for win32 project --- cocos/2d/libcocos2d.vcxproj | 1 + cocos/editor-support/spine/proj.win32/libSpine.vcxproj | 1 + cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj | 1 + cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj | 1 + tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj | 1 + tests/cpp-tests/proj.win32/cpp-tests.vcxproj | 1 + .../game-controller-test/proj.win32/game-controller-test.vcxproj | 1 + tests/js-tests/project/proj.win32/js-tests.vcxproj | 1 + tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj | 1 + tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj | 1 + tests/performance-tests/proj.win32/performance-tests.vcxproj | 1 + 11 files changed, 11 insertions(+) diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index b92c7cada5ef..dc765f0968e8 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -15,6 +15,7 @@ {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} cocos2d-x.win32 Win32Proj + 10.0.17134.0 diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj index bf508ff83c81..ade6722e9676 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj @@ -112,6 +112,7 @@ {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} libSpine + 10.0.17134.0 diff --git a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj index d1a41f005c7c..afd746795a84 100644 --- a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj +++ b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj @@ -124,6 +124,7 @@ {39379840-825A-45A0-B363-C09FFEF864BD} Win32Proj libjscocos2d + 10.0.17134.0 diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj index 462c1092e4cc..e1e807d99163 100644 --- a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj @@ -234,6 +234,7 @@ {9F2D6CE6-C893-4400-B50C-6DB70CC2562F} libluacocos2d Win32Proj + 10.0.17134.0 diff --git a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj index e5241951f25f..6222d48ce909 100644 --- a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj @@ -14,6 +14,7 @@ {B8BF9E81-35FD-4582-BA1C-B85FA365BABB} cpp-empty-test-win32 Win32Proj + 10.0.17134.0 diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index 6db691f5e8c0..993258f22d77 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -14,6 +14,7 @@ {76A39BB2-9B84-4C65-98A5-654D86B86F2A} test_win32 Win32Proj + 10.0.17134.0 diff --git a/tests/game-controller-test/proj.win32/game-controller-test.vcxproj b/tests/game-controller-test/proj.win32/game-controller-test.vcxproj index a7dc0f9e6459..1d0d348cb095 100644 --- a/tests/game-controller-test/proj.win32/game-controller-test.vcxproj +++ b/tests/game-controller-test/proj.win32/game-controller-test.vcxproj @@ -14,6 +14,7 @@ {1FA2BD06-2F52-48F6-8468-C0CC33127F5E} test_win32 Win32Proj + 10.0.17134.0 diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj index 37c376cb8c90..edbb359ab700 100644 --- a/tests/js-tests/project/proj.win32/js-tests.vcxproj +++ b/tests/js-tests/project/proj.win32/js-tests.vcxproj @@ -13,6 +13,7 @@ {D0F06A44-A245-4D13-A498-0120C203B539} js-tests + 10.0.17134.0 diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index 639e7942389c..e043c70c094d 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -13,6 +13,7 @@ {13E55395-94A2-4CD9-BFC2-1A051F80C17D} lua-empty-test.win32 + 10.0.17134.0 diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 16db32e2438d..0c6d184a1622 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -13,6 +13,7 @@ {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED} lua-tests + 10.0.17134.0 diff --git a/tests/performance-tests/proj.win32/performance-tests.vcxproj b/tests/performance-tests/proj.win32/performance-tests.vcxproj index 09818e3d9c53..913a93749ec6 100644 --- a/tests/performance-tests/proj.win32/performance-tests.vcxproj +++ b/tests/performance-tests/proj.win32/performance-tests.vcxproj @@ -14,6 +14,7 @@ {2778C02D-DDD0-4A92-A6AA-C3E2B7EDE3FF} test_win32 Win32Proj + 10.0.17134.0 From a5c3aaf4f1549677ac822e7800e39307914a57ee Mon Sep 17 00:00:00 2001 From: leda Date: Mon, 12 Nov 2018 22:07:10 +0800 Subject: [PATCH 2/9] fix js-tests sources copy --- .../project/proj.win32/js-tests.vcxproj | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj index edbb359ab700..709f7e57841e 100644 --- a/tests/js-tests/project/proj.win32/js-tests.vcxproj +++ b/tests/js-tests/project/proj.win32/js-tests.vcxproj @@ -118,16 +118,16 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ if not exist "$(OutDir)" mkdir "$(OutDir)" -mkdir "$(OutDir)\script" -mkdir "$(OutDir)\src" -mkdir "$(OutDir)\res" +mkdir "$(OutDir)\Resources\script" +mkdir "$(OutDir)\Resources\src" +mkdir "$(OutDir)\Resources\res" xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\script" /e /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y -xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y -copy "$(ProjectDir)..\..\main.js" "$(OutDir)" -copy "$(ProjectDir)..\..\project.json" "$(OutDir)" -xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\Resources\script\" /e /Y +xcopy "$(ProjectDir)..\..\src" "$(OutDir)\Resources\src\" /e /Y +xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\Resources\res\" /e /Y +copy "$(ProjectDir)..\..\main.js" "$(OutDir)\Resources\" +copy "$(ProjectDir)..\..\project.json" "$(OutDir)\Resources\" +xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\Resources\res\resjs\" /e /Y Copy js and resource files. @@ -180,16 +180,16 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ if not exist "$(OutDir)" mkdir "$(OutDir)" -mkdir "$(OutDir)\script" -mkdir "$(OutDir)\src" -mkdir "$(OutDir)\res" +mkdir "$(OutDir)\Resources\script" +mkdir "$(OutDir)\Resources\src" +mkdir "$(OutDir)\Resources\res" xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\script" /e /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y -xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y -copy "$(ProjectDir)..\..\main.js" "$(OutDir)" -copy "$(ProjectDir)..\..\project.json" "$(OutDir)" -xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\Resources\script" /e /Y +xcopy "$(ProjectDir)..\..\src" "$(OutDir)\Resources\src\" /e /Y +xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\Resources\res\" /e /Y +copy "$(ProjectDir)..\..\main.js" "$(OutDir)\Resources\" +copy "$(ProjectDir)..\..\project.json" "$(OutDir)\Resources\" +xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\Resources\res\" /e /Y Copy js and resource files. From f534403853da445c41589a61514389e1460ff690 Mon Sep 17 00:00:00 2001 From: leda Date: Mon, 12 Nov 2018 22:30:15 +0800 Subject: [PATCH 3/9] fix lua tests --- .../project/proj.win32/lua-empty-test.vcxproj | 12 +++++------ .../proj.win32/lua-tests.win32.vcxproj | 20 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index e043c70c094d..a490417d8ab5 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -112,9 +112,9 @@ libcmt.lib;%(IgnoreSpecificDefaultLibraries) - xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y + xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos\" /D /E /I /F /Y xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y @@ -167,9 +167,9 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y + xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos" /D /E /I /F /Y xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 0c6d184a1622..478dfb239283 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -112,11 +112,11 @@ - xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)script" /D /E /I /F /Y + xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)Resources\res\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)Resources\script\" /D /E /I /F /Y xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y copy files @@ -174,11 +174,11 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)script" /D /E /I /F /Y + xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)Resources\res\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)Resources\script\" /D /E /I /F /Y xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y From 9f81c2e1cf91927c695fa710b7e94cc7c4e22578 Mon Sep 17 00:00:00 2001 From: leda Date: Mon, 12 Nov 2018 23:00:56 +0800 Subject: [PATCH 4/9] fix js template --- .../runtime-src/proj.win32/HelloJavascript.vcxproj | 10 +++++----- .../frameworks/runtime-src/proj.win32/HelloLua.vcxproj | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj index 7f85742ed92c..f9bc5d6374b5 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj @@ -121,11 +121,11 @@ - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\script" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\res" /D /E /I /F /Y -copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\" /Y -copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y + xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\Resources\script\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resources\src\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resources\res\" /D /E /I /F /Y +copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\Resources\" /Y +copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\Resources\" /Y $(TargetName).cab $(TargetFileName) diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 2e2bd30b3d9e..4b715d11cb5b 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -130,8 +130,8 @@ if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)" xcopy /Y /Q "$(OutDir)*.dll" "$(LocalDebuggerWorkingDirectory)" -xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\Resources\res\" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\Resources\src\" /D /E /I /F /Y $(TargetName).cab $(TargetFileName) From fad6b14a8e16a6581d4fe986edfa4384d1592849 Mon Sep 17 00:00:00 2001 From: leda Date: Mon, 12 Nov 2018 23:24:09 +0800 Subject: [PATCH 5/9] remove libbox2d.vcxproj ref --- cocos/2d/libcocos2d_win10/libcocos2d.vcxproj | 3 --- templates/cpp-template-default/proj.win32/HelloCpp.vcxproj | 3 --- .../frameworks/runtime-src/proj.win32/HelloJavascript.sln | 2 -- .../frameworks/runtime-src/proj.win32/HelloLua.sln | 2 -- tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj | 3 --- tests/cpp-tests/proj.win10/cpp-tests.vcxproj | 3 --- 6 files changed, 16 deletions(-) diff --git a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj index 07188708b904..9c4c452c36f8 100644 --- a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj @@ -1505,9 +1505,6 @@ - - {0c32d479-46d5-46c3-9aa9-0a8ff8320516} - {f551524d-8a70-4b2f-a7c2-28ae61150022} diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj index f13996efb729..957b98e9746f 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj @@ -164,9 +164,6 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)\Resources\" /D /E /I /F /Y {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - {929480e7-23c0-4df6-8456-096d71547116} - diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln index eeea8258df5d..8486def35509 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln +++ b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln @@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{8C EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\..\cocos2d-x\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln index a542ebadb134..a8e7d19348ee 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -12,8 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsimulator", "..\..\cocos2d-x\tools\simulator\libsimulator\proj.win32\libsimulator.vcxproj", "{001B324A-BB91-4E83-875C-C92F75C40857}" diff --git a/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj b/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj index 149228aed759..5023d932273f 100644 --- a/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj @@ -356,9 +356,6 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat {4b3ba10a-941f-4e08-8a50-8a7fcb822bb8} - - {0c32d479-46d5-46c3-9aa9-0a8ff8320516} - diff --git a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj index 590441fd458b..dfe5113073d5 100644 --- a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj @@ -594,9 +594,6 @@ {4b3ba10a-941f-4e08-8a50-8a7fcb822bb8} - - {0c32d479-46d5-46c3-9aa9-0a8ff8320516} - From c5b46066d015c343e73ab1b01a52cf3469239491 Mon Sep 17 00:00:00 2001 From: leda Date: Tue, 13 Nov 2018 10:27:53 +0800 Subject: [PATCH 6/9] improve js source copy --- .../project/proj.win32/js-tests.vcxproj | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj index 709f7e57841e..fae67edd8b48 100644 --- a/tests/js-tests/project/proj.win32/js-tests.vcxproj +++ b/tests/js-tests/project/proj.win32/js-tests.vcxproj @@ -103,11 +103,6 @@ 0x0409 $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) @@ -115,7 +110,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ Windows MachineX86 - + if not exist "$(OutDir)" mkdir "$(OutDir)" mkdir "$(OutDir)\Resources\script" @@ -128,10 +123,10 @@ xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\Resources\res\" /e copy "$(ProjectDir)..\..\main.js" "$(OutDir)\Resources\" copy "$(ProjectDir)..\..\project.json" "$(OutDir)\Resources\" xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\Resources\res\resjs\" /e /Y - - + + Copy js and resource files. - + @@ -165,11 +160,6 @@ xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\Resources\res\resjs\" /e /Y0x0409 $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) @@ -177,7 +167,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ MachineX86 true - + if not exist "$(OutDir)" mkdir "$(OutDir)" mkdir "$(OutDir)\Resources\script" @@ -191,7 +181,10 @@ copy "$(ProjectDir)..\..\main.js" "$(OutDir)\Resources\" copy "$(ProjectDir)..\..\project.json" "$(OutDir)\Resources\" xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\Resources\res\" /e /Y Copy js and resource files. - + + + Copy js and resource files. + From 52e0cc6a7564b7b3cac7336721b7f898e3a59927 Mon Sep 17 00:00:00 2001 From: leda Date: Tue, 13 Nov 2018 10:50:08 +0800 Subject: [PATCH 7/9] copy source in post build event --- .../project/proj.win32/lua-empty-test.vcxproj | 8 ++++---- .../lua-tests/project/proj.win32/lua-tests.win32.vcxproj | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index a490417d8ab5..f3b58d34297e 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -111,12 +111,12 @@ MachineX86 libcmt.lib;%(IgnoreSpecificDefaultLibraries) - + xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos\" /D /E /I /F /Y xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - + @@ -166,12 +166,12 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - + xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)Resources\src\cocos" /D /E /I /F /Y xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - + diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 478dfb239283..39aadd707377 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -111,7 +111,7 @@ - + xcopy "$(ProjectDir)..\..\res" "$(OutDir)Resources\res\" /D /E /I /F /Y xcopy "$(ProjectDir)..\..\src" "$(OutDir)Resources\src\" /D /E /I /F /Y xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)Resources\res\" /D /E /I /F /Y @@ -119,7 +119,7 @@ xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)R xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)Resources\script\" /D /E /I /F /Y xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y copy files - + @@ -164,11 +164,11 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - + copy files - + From 3f5c9dabc8d4af47e3267d4a86aee99f555b266b Mon Sep 17 00:00:00 2001 From: leda Date: Tue, 13 Nov 2018 11:38:27 +0800 Subject: [PATCH 8/9] little improve --- external/config.json | 2 +- tests/cpp-tests/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/external/config.json b/external/config.json index 9264eb523059..b5ac2b942c0c 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version": "v3-deps-146", + "version": "v3-deps-147", "zip_file_size": "146254799", "repo_name": "cocos2d-x-3rd-party-libs-bin", "repo_parent": "https://github.com/cocos2d/", diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index ecb077732201..0d8d27a121b6 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -475,6 +475,8 @@ if(APPLE) set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}") endif() elseif(WINDOWS) + # "too large PDB" error often occurs in cpp-tests when using default "/Zi" + target_compile_options(${APP_NAME} PRIVATE /Z7) cocos_copy_target_dll(${APP_NAME} COPY_TO ${APP_RES_DIR}/..) endif() From 8efa85ccf6cc9c7772c7bbd268ed858873ef6997 Mon Sep 17 00:00:00 2001 From: leda Date: Tue, 13 Nov 2018 14:39:16 +0800 Subject: [PATCH 9/9] update external --- external/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/config.json b/external/config.json index b5ac2b942c0c..73143dfae6e7 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version": "v3-deps-147", + "version": "v3-deps-148", "zip_file_size": "146254799", "repo_name": "cocos2d-x-3rd-party-libs-bin", "repo_parent": "https://github.com/cocos2d/",