Merge pull request #8021 from huangshiwu/v3_shadercompilefix

V3 shadercompilefix
2014-09-12 16:10:01 +08:00 · 2014-09-12 16:10:01 +08:00 · 35a481f36b
parent 7256865f76 0addaf3912
commit 35a481f36b
11 changed files with 62 additions and 31 deletions
--- 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
--- a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj
+++ b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj
@ -249,9 +249,6 @@
    <ProjectReference Include="..\..\..\cocos\2d\cocos2d_winrt.vcxproj">
      <Project>{2330edf4-5596-4b53-8ba5-158ddde713d9}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\chipmunk\proj.winrt\chipmunk.vcxproj">
-      <Project>{8b143765-5c1b-4076-9384-3e0ec3650b1a}</Project>
-    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/cocos/2d/cocos2d_winrt.vcxproj
+++ b/cocos/2d/cocos2d_winrt.vcxproj
@ -143,6 +143,7 @@
      <PreprocessorDefinitions>WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4267;4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <AdditionalOptions>-Zm110 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -151,8 +152,8 @@
    </Link>
    <Lib>
      <AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(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)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;libchipmunk.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(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)</AdditionalLibraryDirectories>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -346,9 +347,9 @@
      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
    </ClCompile>
    <ClCompile Include="..\base\CCIMEDispatcher.cpp" />
-    <ClCompile Include="..\base\CCModuleManager.cpp" />
    <ClCompile Include="..\base\CCNS.cpp" />
    <ClCompile Include="..\base\CCProfiling.cpp" />
+    <ClCompile Include="..\base\ccRandom.cpp" />
    <ClCompile Include="..\base\CCRef.cpp" />
    <ClCompile Include="..\base\CCScheduler.cpp" />
    <ClCompile Include="..\base\CCScriptSupport.cpp" />
@ -434,6 +435,7 @@
    <ClCompile Include="..\renderer\CCTexture2D.cpp" />
    <ClCompile Include="..\renderer\CCTextureAtlas.cpp" />
    <ClCompile Include="..\renderer\CCTextureCache.cpp" />
+    <ClCompile Include="..\renderer\CCTrianglesCommand.cpp" />
    <ClCompile Include="..\renderer\CCVertexIndexBuffer.cpp" />
    <ClCompile Include="..\renderer\CCVertexIndexData.cpp" />
    <ClCompile Include="CCAction.cpp" />
@ -542,12 +544,12 @@
    <ClInclude Include="..\base\CCIMEDispatcher.h" />
    <ClInclude Include="..\base\ccMacros.h" />
    <ClInclude Include="..\base\CCMap.h" />
-    <ClInclude Include="..\base\CCModuleManager.h" />
    <ClInclude Include="..\base\CCNS.h" />
    <ClInclude Include="..\base\CCPlatformConfig.h" />
    <ClInclude Include="..\base\CCPlatformMacros.h" />
    <ClInclude Include="..\base\CCProfiling.h" />
    <ClInclude Include="..\base\CCProtocols.h" />
+    <ClInclude Include="..\base\ccRandom.h" />
    <ClInclude Include="..\base\CCRef.h" />
    <ClInclude Include="..\base\CCRefPtr.h" />
    <ClInclude Include="..\base\CCScheduler.h" />
@ -605,9 +607,14 @@
    <ClInclude Include="..\platform\CCCommon.h" />
    <ClInclude Include="..\platform\CCDevice.h" />
    <ClInclude Include="..\platform\CCFileUtils.h" />
+    <ClInclude Include="..\platform\CCGL.h" />
    <ClInclude Include="..\platform\CCGLView.h" />
    <ClInclude Include="..\platform\CCImage.h" />
+    <ClInclude Include="..\platform\CCPlatformConfig.h" />
+    <ClInclude Include="..\platform\CCPlatformDefine.h" />
+    <ClInclude Include="..\platform\CCPlatformMacros.h" />
    <ClInclude Include="..\platform\CCSAXParser.h" />
+    <ClInclude Include="..\platform\CCStdC.h" />
    <ClInclude Include="..\platform\CCThread.h" />
    <ClInclude Include="..\platform\winrt\CCApplication.h" />
    <ClInclude Include="..\platform\winrt\CCFileUtilsWinRT.h" />
@ -645,6 +652,7 @@
    <ClInclude Include="..\renderer\CCTexture2D.h" />
    <ClInclude Include="..\renderer\CCTextureAtlas.h" />
    <ClInclude Include="..\renderer\CCTextureCache.h" />
+    <ClInclude Include="..\renderer\CCTrianglesCommand.h" />
    <ClInclude Include="..\renderer\CCVertexIndexBuffer.h" />
    <ClInclude Include="..\renderer\CCVertexIndexData.h" />
    <ClInclude Include="CCAction.h" />
--- a/cocos/2d/cocos2d_winrt.vcxproj.filters
+++ b/cocos/2d/cocos2d_winrt.vcxproj.filters
@ -584,9 +584,6 @@
    <ClCompile Include="..\base\CCCamera.cpp">
      <Filter>base</Filter>
    </ClCompile>
-    <ClCompile Include="..\base\CCModuleManager.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
    <ClCompile Include="..\renderer\CCPrimitiveCommand.cpp">
      <Filter>renderer</Filter>
    </ClCompile>
@ -599,6 +596,12 @@
    <ClCompile Include="..\renderer\CCVertexIndexData.cpp">
      <Filter>renderer</Filter>
    </ClCompile>
+    <ClCompile Include="..\renderer\CCTrianglesCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\ccRandom.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\cocos2d.h" />
@ -1209,9 +1212,6 @@
    <ClInclude Include="..\base\CCCamera.h">
      <Filter>base</Filter>
    </ClInclude>
-    <ClInclude Include="..\base\CCModuleManager.h">
-      <Filter>base</Filter>
-    </ClInclude>
    <ClInclude Include="..\renderer\CCPrimitiveCommand.h">
      <Filter>renderer</Filter>
    </ClInclude>
@ -1224,6 +1224,27 @@
    <ClInclude Include="..\renderer\CCVertexIndexData.h">
      <Filter>renderer</Filter>
    </ClInclude>
+    <ClInclude Include="..\platform\CCPlatformConfig.h">
+      <Filter>platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\CCPlatformDefine.h">
+      <Filter>platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\CCPlatformMacros.h">
+      <Filter>platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\CCGL.h">
+      <Filter>platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\CCStdC.h">
+      <Filter>platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCTrianglesCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\ccRandom.h">
+      <Filter>base</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\base\CCUserDefault.mm">
--- a/cocos/2d/cocos2d_wp8.vcxproj
+++ b/cocos/2d/cocos2d_wp8.vcxproj
@ -226,6 +226,7 @@
    <ClCompile Include="..\3d\CCAnimate3D.cpp" />
    <ClCompile Include="..\3d\CCAnimation3D.cpp" />
    <ClCompile Include="..\3d\CCAttachNode.cpp" />
+    <ClCompile Include="..\3d\CCBillBoard.cpp" />
    <ClCompile Include="..\3d\CCBundle3D.cpp" />
    <ClCompile Include="..\3d\CCBundleReader.cpp" />
    <ClCompile Include="..\3d\CCMesh.cpp" />
@ -450,6 +451,7 @@
    <ClInclude Include="..\3d\CCAnimation3D.h" />
    <ClInclude Include="..\3d\CCAnimationCurve.h" />
    <ClInclude Include="..\3d\CCAttachNode.h" />
+    <ClInclude Include="..\3d\CCBillBoard.h" />
    <ClInclude Include="..\3d\CCBundle3D.h" />
    <ClInclude Include="..\3d\CCBundle3DData.h" />
    <ClInclude Include="..\3d\CCBundleReader.h" />
--- a/cocos/2d/cocos2d_wp8.vcxproj.filters
+++ b/cocos/2d/cocos2d_wp8.vcxproj.filters
@ -659,6 +659,9 @@
    <ClCompile Include="..\platform\wp8\CCGLViewImpl-wp8.cpp">
      <Filter>platform\wp8</Filter>
    </ClCompile>
+    <ClCompile Include="..\3d\CCBillBoard.cpp">
+      <Filter>3d</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\physics\CCPhysicsBody.h">
@ -1358,6 +1361,9 @@
    <ClInclude Include="..\platform\wp8\CCGLViewImpl-wp8.h">
      <Filter>platform\wp8</Filter>
    </ClInclude>
+    <ClInclude Include="..\3d\CCBillBoard.h">
+      <Filter>3d</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\math\Mat4.inl">
--- 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"
--- 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"
--- 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"
--- 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 @@
    <ClCompile Include="..\..\..\..\cocos\platform\wp8-xaml\cpp\DirectXBase.cpp" />
    <ClCompile Include="..\..\..\..\cocos\platform\wp8-xaml\cpp\EditBoxEvent.cpp" />
    <ClCompile Include="..\..\Classes\BaseTest.cpp" />
+    <ClCompile Include="..\..\Classes\BillBoardTest\BillBoardTest.cpp" />
    <ClCompile Include="..\..\Classes\BugsTest\Bug-Child.cpp" />
    <ClCompile Include="..\..\Classes\Camera3DTest\Camera3DTest.cpp" />
    <ClCompile Include="..\..\Classes\ChipmunkTest\ChipmunkTest.cpp" />
@ -378,6 +379,7 @@
    <ClInclude Include="..\..\..\..\cocos\platform\wp8-xaml\cpp\DirectXHelper.h" />
    <ClInclude Include="..\..\..\..\cocos\platform\wp8-xaml\cpp\EditBoxEvent.h" />
    <ClInclude Include="..\..\Classes\BaseTest.h" />
+    <ClInclude Include="..\..\Classes\BillBoardTest\BillBoardTest.h" />
    <ClInclude Include="..\..\Classes\Box2DTestBed\Tests\ConvexHull.h" />
    <ClInclude Include="..\..\Classes\Box2DTestBed\Tests\ConveyorBelt.h" />
    <ClInclude Include="..\..\Classes\Box2DTestBed\Tests\Mobile.h" />
--- 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 @@
    <Filter Include="Classes\Camera3DTest">
      <UniqueIdentifier>{d17dc00f-2b4d-46af-a1ff-c3f4d937d621}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Classes\BillBoardTest">
+      <UniqueIdentifier>{4dadf399-3bf1-4d35-85d1-d8def766fe0f}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\Classes\AppDelegate.cpp">
@ -856,6 +859,9 @@
      <Filter>Classes\Camera3DTest</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.cpp" />
+    <ClCompile Include="..\..\Classes\BillBoardTest\BillBoardTest.cpp">
+      <Filter>Classes\BillBoardTest</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\Classes\AppDelegate.h">
@ -1589,6 +1595,9 @@
      <Filter>Classes\Camera3DTest</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.h" />
+    <ClInclude Include="..\..\Classes\BillBoardTest\BillBoardTest.h">
+      <Filter>Classes\BillBoardTest</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\..\..\external\curl\prebuilt\wp8\arm\libcurl.dll" />