From 147bb7301b3caabbdc95ed7f909d62f0cc81ebe5 Mon Sep 17 00:00:00 2001 From: huangshiwu Date: Fri, 12 Sep 2014 09:33:30 +0800 Subject: [PATCH 1/2] fix wp8 compile error --add BillBoard and BillBoardTest --- cocos/2d/cocos2d_wp8.vcxproj | 2 ++ cocos/2d/cocos2d_wp8.vcxproj.filters | 6 ++++++ .../cpp-testsComponent/cpp-testsComponent.vcxproj | 2 ++ .../cpp-testsComponent.vcxproj.filters | 9 +++++++++ 4 files changed, 19 insertions(+) diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index 1e793f6464..ceeb33b942 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -226,6 +226,7 @@ + @@ -450,6 +451,7 @@ + diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index f2ef328bdc..c8defb9951 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -659,6 +659,9 @@ platform\wp8 + + 3d + @@ -1358,6 +1361,9 @@ platform\wp8 + + 3d + diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj index 22ae303431..44cadcb0c3 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj @@ -184,6 +184,7 @@ + @@ -378,6 +379,7 @@ + diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters index 3a2638f4ef..06e1b9e7d3 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters @@ -322,6 +322,9 @@ {d17dc00f-2b4d-46af-a1ff-c3f4d937d621} + + {4dadf399-3bf1-4d35-85d1-d8def766fe0f} + @@ -856,6 +859,9 @@ Classes\Camera3DTest + + Classes\BillBoardTest + @@ -1589,6 +1595,9 @@ Classes\Camera3DTest + + Classes\BillBoardTest + From f1f6373b6ee18749a0fcb973cf722e1b08a5dcba Mon Sep 17 00:00:00 2001 From: huangshiwu Date: Fri, 12 Sep 2014 15:29:10 +0800 Subject: [PATCH 2/2] fix Cocos2dShaderCompile's compile error --use chipmunk static library --- .../Cocos2dShaderCompiler.sln | 16 +-------- .../Cocos2dShaderCompiler.vcxproj | 3 -- cocos/2d/cocos2d_winrt.vcxproj | 16 ++++++--- cocos/2d/cocos2d_winrt.vcxproj.filters | 33 +++++++++++++++---- cocos/platform/CCGL.h | 2 +- cocos/platform/CCPlatformDefine.h | 2 +- cocos/platform/CCStdC.h | 2 +- 7 files changed, 43 insertions(+), 31 deletions(-) diff --git a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln index a55a9955d7..19e9068b62 100644 --- a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln +++ b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln @@ -1,12 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30324.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dShaderCompiler", "Cocos2dShaderCompiler.vcxproj", "{4F6DEF20-AC4C-487F-85B8-5993519E3911}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\..\external\chipmunk\proj.winrt\chipmunk.vcxproj", "{8B143765-5C1B-4076-9384-3E0EC3650B1A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\..\cocos\2d\cocos2d_winrt.vcxproj", "{2330EDF4-5596-4B53-8BA5-158DDDE713D9}" EndProject Global @@ -37,18 +35,6 @@ Global {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.ActiveCfg = Release|x64 {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Build.0 = Release|x64 {4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Deploy.0 = Release|x64 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Debug|ARM.ActiveCfg = Debug|ARM - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Debug|ARM.Build.0 = Debug|ARM - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Debug|Win32.Build.0 = Debug|Win32 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Debug|x64.ActiveCfg = Debug|x64 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Debug|x64.Build.0 = Debug|x64 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Release|ARM.ActiveCfg = Release|ARM - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Release|ARM.Build.0 = Release|ARM - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Release|Win32.ActiveCfg = Release|Win32 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Release|Win32.Build.0 = Release|Win32 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Release|x64.ActiveCfg = Release|x64 - {8B143765-5C1B-4076-9384-3E0EC3650B1A}.Release|x64.Build.0 = Release|x64 {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|ARM.ActiveCfg = Debug|ARM {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|ARM.Build.0 = Debug|ARM {2330EDF4-5596-4B53-8BA5-158DDDE713D9}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj index cbc702706c..241f6f7220 100644 --- a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj +++ b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj @@ -249,9 +249,6 @@ {2330edf4-5596-4b53-8ba5-158ddde713d9} - - {8b143765-5c1b-4076-9384-3e0ec3650b1a} - diff --git a/cocos/2d/cocos2d_winrt.vcxproj b/cocos/2d/cocos2d_winrt.vcxproj index 61a777d5a6..157e3bb27f 100644 --- a/cocos/2d/cocos2d_winrt.vcxproj +++ b/cocos/2d/cocos2d_winrt.vcxproj @@ -143,6 +143,7 @@ WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4267;4251;4244;4996;%(DisableSpecificWarnings) pch.h + -Zm110 %(AdditionalOptions) Console @@ -151,8 +152,8 @@ /IGNORE:4264 %(AdditionalOptions) - zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) + zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;libchipmunk.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\external\png\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\jpeg\prebuilt\winrt\$(Platform);$(ProjectDir)..\..\external\tiff\prebuilt\winrt\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\wp8\$(Platform);$(ProjectDir)..\..\external\freetype2\prebuilt\winrt\$(Platform);%(AdditionalLibraryDirectories) @@ -346,9 +347,9 @@ CompileAsCpp - + @@ -434,6 +435,7 @@ + @@ -542,12 +544,12 @@ - + @@ -605,9 +607,14 @@ + + + + + @@ -645,6 +652,7 @@ + diff --git a/cocos/2d/cocos2d_winrt.vcxproj.filters b/cocos/2d/cocos2d_winrt.vcxproj.filters index c49292bf34..a395535147 100644 --- a/cocos/2d/cocos2d_winrt.vcxproj.filters +++ b/cocos/2d/cocos2d_winrt.vcxproj.filters @@ -584,9 +584,6 @@ base - - base - renderer @@ -599,6 +596,12 @@ renderer + + renderer + + + base + @@ -1209,9 +1212,6 @@ base - - base - renderer @@ -1224,6 +1224,27 @@ renderer + + platform + + + platform + + + platform + + + platform + + + platform + + + renderer + + + base + diff --git a/cocos/platform/CCGL.h b/cocos/platform/CCGL.h index 0b3a703e99..141f3639bf 100644 --- a/cocos/platform/CCGL.h +++ b/cocos/platform/CCGL.h @@ -36,7 +36,7 @@ THE SOFTWARE. #include "platform/android/CCGL-android.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "platform/win32/CCGL-win32.h" -#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8 +#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #include "platform/winrt/CCGL.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "platform/linux/CCGL-linux.h" diff --git a/cocos/platform/CCPlatformDefine.h b/cocos/platform/CCPlatformDefine.h index 0b218eb6ca..0422c24c21 100644 --- a/cocos/platform/CCPlatformDefine.h +++ b/cocos/platform/CCPlatformDefine.h @@ -36,7 +36,7 @@ THE SOFTWARE. #include "platform/android/CCPlatformDefine-android.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "platform/win32/CCPlatformDefine-win32.h" -#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8 +#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #include "platform/winrt/CCPlatformDefine.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "platform/linux/CCPlatformDefine-linux.h" diff --git a/cocos/platform/CCStdC.h b/cocos/platform/CCStdC.h index 9ea6eba3be..8700aec3c0 100644 --- a/cocos/platform/CCStdC.h +++ b/cocos/platform/CCStdC.h @@ -36,7 +36,7 @@ THE SOFTWARE. #include "platform/android/CCStdC-android.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "platform/win32/CCStdC-win32.h" -#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8 +#elif CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #include "platform/winrt/CCStdC.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "platform/linux/CCStdC-linux.h"