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/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/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/external/config.json b/external/config.json index 9264eb523059..73143dfae6e7 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version": "v3-deps-146", + "version": "v3-deps-148", "zip_file_size": "146254799", "repo_name": "cocos2d-x-3rd-party-libs-bin", "repo_parent": "https://github.com/cocos2d/", 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/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.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/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) 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-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/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() 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} - 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..fae67edd8b48 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 @@ -102,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) @@ -114,23 +110,23 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ Windows MachineX86 - + 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. - + @@ -164,11 +160,6 @@ xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y 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) @@ -176,21 +167,24 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ MachineX86 true - + 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. + + Copy js and resource files. - + 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..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 @@ -13,6 +13,7 @@ {13E55395-94A2-4CD9-BFC2-1A051F80C17D} lua-empty-test.win32 + 10.0.17134.0 @@ -110,12 +111,12 @@ MachineX86 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 - + @@ -165,12 +166,12 @@ 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 16db32e2438d..39aadd707377 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 @@ -110,15 +111,15 @@ - - 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 - + @@ -163,21 +164,21 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - + copy files - + - 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 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