From d55bc653e0e5c80c4f08ee34a0717935500cfa03 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Thu, 20 Aug 2015 13:25:17 -0700 Subject: [PATCH 1/2] update c++ debug info settings --- .../libcocos2d_8_1.Windows.vcxproj | 6 ++++++ .../libcocos2d_8_1.WindowsPhone.vcxproj | 4 ++++ cocos/2d/libcocos2d_win10/libcocos2d.vcxproj | 2 ++ .../editor-support/spine/proj.win10/libSpine.vcxproj | 8 ++++++++ .../libSpine.Windows/libSpine.Windows.vcxproj | 12 ++++++++++++ .../libSpine.WindowsPhone.vcxproj | 8 ++++++++ .../libjscocos2d.Windows.vcxproj | 11 +++++++---- .../libjscocos2d.WindowsPhone.vcxproj | 8 +++++--- .../cpp-empty-test/proj.win10/cpp-empty-test.vcxproj | 3 ++- .../HelloCpp.Windows/HelloCpp.Windows.vcxproj | 6 ++++++ .../HelloCpp.WindowsPhone.vcxproj | 4 ++++ tests/cpp-tests/proj.win10/cpp-tests.vcxproj | 2 ++ .../cpp-tests.Windows/cpp-tests.Windows.vcxproj | 8 +++++++- .../cpp-tests.WindowsPhone.vcxproj | 6 +++++- .../App.Windows/js-tests.Windows.vcxproj | 6 ++++++ .../App.WindowsPhone/js-tests.WindowsPhone.vcxproj | 6 +++++- 16 files changed, 89 insertions(+), 11 deletions(-) diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj index b0a4774f5e..a834e12594 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj @@ -166,6 +166,7 @@ _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -187,6 +188,7 @@ _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -207,6 +209,7 @@ _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -228,6 +231,7 @@ _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -248,6 +252,7 @@ _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -269,6 +274,7 @@ _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj index 09ede23e91..36897d70d2 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj @@ -120,6 +120,7 @@ CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -141,6 +142,7 @@ CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -161,6 +163,7 @@ CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console @@ -182,6 +185,7 @@ CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) + ProgramDatabase Console diff --git a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj index c23471ad51..5f0d9efca4 100644 --- a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj @@ -1560,6 +1560,7 @@ $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) /Zm384 /bigobj %(AdditionalOptions) false + ProgramDatabase Console @@ -1637,6 +1638,7 @@ $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) /Zm384 /bigobj %(AdditionalOptions) false + ProgramDatabase Console diff --git a/cocos/editor-support/spine/proj.win10/libSpine.vcxproj b/cocos/editor-support/spine/proj.win10/libSpine.vcxproj index 270853bbac..f53067aef1 100644 --- a/cocos/editor-support/spine/proj.win10/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win10/libSpine.vcxproj @@ -383,6 +383,7 @@ 4458;4456;4996;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -401,6 +402,8 @@ false 4458;4456;4996;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) + $(OutDir)$(TargetName).pdb + ProgramDatabase Console @@ -420,6 +423,7 @@ 4458;4456;4996;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -439,6 +443,7 @@ 4458;4456;4996;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -458,6 +463,7 @@ 4458;4456;4996;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -476,6 +482,8 @@ false 4458;4456;4996;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) + $(OutDir)$(TargetName).pdb + ProgramDatabase Console diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj index dce8fd1174..9531a55444 100644 --- a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj @@ -129,6 +129,8 @@ WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -147,6 +149,8 @@ WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -165,6 +169,8 @@ WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -183,6 +189,8 @@ WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -201,6 +209,8 @@ WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -219,6 +229,8 @@ WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console diff --git a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj index f9a8f45178..278333145b 100644 --- a/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj +++ b/cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj @@ -94,6 +94,8 @@ WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -112,6 +114,8 @@ WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -130,6 +134,8 @@ WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console @@ -148,6 +154,8 @@ WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) + ProgramDatabase + $(OutDir)$(TargetName).pdb Console diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj index 1a7926f54d..0a007232a3 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj @@ -131,6 +131,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true + ProgramDatabase Console @@ -151,7 +152,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false - OldStyle + ProgramDatabase Console @@ -173,6 +174,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true + ProgramDatabase Console @@ -193,7 +195,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false - OldStyle + ProgramDatabase Console @@ -215,6 +217,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true + ProgramDatabase Console @@ -235,7 +238,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false - OldStyle + ProgramDatabase Console @@ -250,4 +253,4 @@ - + \ No newline at end of file diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj index f2b5f8c7f0..89be7f39b6 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj @@ -96,6 +96,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true + ProgramDatabase Console @@ -116,7 +117,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false - OldStyle + ProgramDatabase Console @@ -138,6 +139,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true + ProgramDatabase Console @@ -158,7 +160,7 @@ Level3 CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false - OldStyle + ProgramDatabase Console @@ -173,4 +175,4 @@ - + \ No newline at end of file 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 3fed10d13a..cb9bfee2b0 100644 --- a/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj @@ -234,7 +234,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat pch.h false ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) - OldStyle + ProgramDatabase echo "Copying Windows 10.0 Universal App CPP template files" @@ -287,6 +287,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat pch.h false ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) + ProgramDatabase echo "Copying Windows 10.0 Universal App CPP template files" diff --git a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj index cdcc55bdb8..b137ac9365 100644 --- a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj +++ b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.Windows/HelloCpp.Windows.vcxproj @@ -123,6 +123,7 @@ pch.h ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false + ProgramDatabase echo "Copying Windows 8.1 Universal App CPP template files" @@ -151,6 +152,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat pch.h ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false + ProgramDatabase echo "Copying Windows 8.1 Universal App CPP template files" @@ -176,6 +178,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat pch.h ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false + ProgramDatabase echo "Copying Windows 8.1 Universal App CPP template files" @@ -204,6 +207,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat pch.h ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false + ProgramDatabase echo "Copying Windows 8.1 Universal App CPP template files" @@ -229,6 +233,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat pch.h ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false + ProgramDatabase echo "Copying Windows 8.1 Universal App CPP template files" @@ -257,6 +262,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat pch.h ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false + ProgramDatabase echo "Copying Windows 8.1 Universal App CPP template files" diff --git a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj index 1aadc4ddd1..1adb645e97 100644 --- a/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj +++ b/tests/cpp-empty-test/proj.win8.1-universal/HelloCpp.WindowsPhone/HelloCpp.WindowsPhone.vcxproj @@ -90,6 +90,7 @@ ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + ProgramDatabase MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -103,6 +104,7 @@ ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ProgramDatabase @@ -113,6 +115,7 @@ ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + ProgramDatabase MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -126,6 +129,7 @@ ../../Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_WINDOWS_PHONE_8_1;WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ProgramDatabase diff --git a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj index 51434d6881..3eeff99840 100644 --- a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj @@ -198,6 +198,7 @@ false false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -226,6 +227,7 @@ false false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + ProgramDatabase diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj index 43403d9726..f4078934d9 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj @@ -118,6 +118,8 @@ CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false false + ProgramDatabase + ProgramDatabase @@ -138,6 +140,8 @@ CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false false + ProgramDatabase + ProgramDatabase @@ -158,6 +162,8 @@ CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false false + ProgramDatabase + ProgramDatabase @@ -192,4 +198,4 @@ - + \ No newline at end of file diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj index fab81c3729..e04b850c8e 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj @@ -90,6 +90,8 @@ Use false false + ProgramDatabase + ProgramDatabase @@ -113,6 +115,8 @@ Use false false + ProgramDatabase + ProgramDatabase @@ -158,4 +162,4 @@ - + \ No newline at end of file diff --git a/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj b/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj index bedded9b13..78058f09b1 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj +++ b/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj @@ -124,6 +124,7 @@ $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -156,6 +157,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -185,6 +187,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -217,6 +220,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -246,6 +250,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -276,6 +281,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + ProgramDatabase echo "Copying Windows 8.1 Universal App CPP template files" diff --git a/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj b/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj index 72f51d7a4c..07385eb555 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj +++ b/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj @@ -90,6 +90,7 @@ $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + ProgramDatabase MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -103,6 +104,7 @@ $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -113,6 +115,7 @@ $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + ProgramDatabase MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -126,6 +129,7 @@ $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + ProgramDatabase @@ -158,4 +162,4 @@ - + \ No newline at end of file From c47de9d04fd4b45b85be5dba1d8315a37febf492 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Thu, 20 Aug 2015 13:25:57 -0700 Subject: [PATCH 2/2] make new render surface current after device lost --- cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp | 1 + .../proj.win10/App/Cocos2dEngine/OpenGLESPage.xaml.cpp | 1 + .../proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp | 1 + .../proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp b/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp index 97423eb9b6..f3626be22d 100644 --- a/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp +++ b/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp @@ -433,6 +433,7 @@ void OpenGLESPage::StartRenderLoop() if (!mDeviceLost) { + mOpenGLES->MakeCurrent(mRenderSurface); // restart cocos2d-x mRenderer->DeviceLost(); } diff --git a/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/OpenGLESPage.xaml.cpp b/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/OpenGLESPage.xaml.cpp index 97423eb9b6..f3626be22d 100644 --- a/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/OpenGLESPage.xaml.cpp +++ b/templates/cpp-template-default/proj.win10/App/Cocos2dEngine/OpenGLESPage.xaml.cpp @@ -433,6 +433,7 @@ void OpenGLESPage::StartRenderLoop() if (!mDeviceLost) { + mOpenGLES->MakeCurrent(mRenderSurface); // restart cocos2d-x mRenderer->DeviceLost(); } diff --git a/templates/cpp-template-default/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp b/templates/cpp-template-default/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp index 97423eb9b6..f3626be22d 100644 --- a/templates/cpp-template-default/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp +++ b/templates/cpp-template-default/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp @@ -433,6 +433,7 @@ void OpenGLESPage::StartRenderLoop() if (!mDeviceLost) { + mOpenGLES->MakeCurrent(mRenderSurface); // restart cocos2d-x mRenderer->DeviceLost(); } diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp index 97423eb9b6..f3626be22d 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp @@ -433,6 +433,7 @@ void OpenGLESPage::StartRenderLoop() if (!mDeviceLost) { + mOpenGLES->MakeCurrent(mRenderSurface); // restart cocos2d-x mRenderer->DeviceLost(); }