diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln index 22c9464a6e..9a3f157f73 100644 --- a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln +++ b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln @@ -1,14 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dShaderCompiler", "Cocos2dShaderCompiler.vcxproj", "{4F6DEF20-AC4C-487F-85B8-5993519E3911}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{29321038-F308-421E-B8CA-140BB23D3C6D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{ECA7A2AA-8501-4177-8360-322A569B6C3E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Box2D", "Box2D", "{7CA66464-6A5E-493B-82EF-DBD84F91766F}" @@ -23,14 +19,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Shared", "..\..\.. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Windows", "..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Windows\libSpine.Windows.vcxproj", "{F3550FE0-C795-44F6-8FEB-093EB68143AE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Windows", "..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Windows\libcocos2d_8_1.Windows.vcxproj", "{9335005F-678E-4E8E-9B84-50037216AEC8}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4 ..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9 ..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9 - ..\..\..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9 ..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{3b26a12d-3a44-47ea-82d2-282660fc844d}*SharedItemsImports = 4 ..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4 EndGlobalSection @@ -85,30 +77,16 @@ Global {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|Win32.Build.0 = Release|Win32 {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.ActiveCfg = Release|x64 {F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.Build.0 = Release|x64 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.ActiveCfg = Debug|ARM - {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.Build.0 = Debug|ARM - {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.ActiveCfg = Debug|Win32 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.Build.0 = Debug|Win32 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.ActiveCfg = Debug|x64 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.Build.0 = Debug|x64 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.ActiveCfg = Release|ARM - {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.Build.0 = Release|ARM - {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.ActiveCfg = Release|Win32 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.Build.0 = Release|Win32 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.ActiveCfg = Release|x64 - {9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5D6F020F-7E72-4494-90A0-2DF11D235DF9} = {29321038-F308-421E-B8CA-140BB23D3C6D} {7CA66464-6A5E-493B-82EF-DBD84F91766F} = {ECA7A2AA-8501-4177-8360-322A569B6C3E} {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} = {ECA7A2AA-8501-4177-8360-322A569B6C3E} {4A3C6BA8-C227-498B-AA21-40BDA27B461F} = {7CA66464-6A5E-493B-82EF-DBD84F91766F} {3B26A12D-3A44-47EA-82D2-282660FC844D} = {7CA66464-6A5E-493B-82EF-DBD84F91766F} {ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} {F3550FE0-C795-44F6-8FEB-093EB68143AE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} - {9335005F-678E-4E8E-9B84-50037216AEC8} = {29321038-F308-421E-B8CA-140BB23D3C6D} EndGlobalSection EndGlobal diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj index da1d0cbfe5..a9eb8d5506 100644 --- a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj +++ b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj @@ -286,8 +286,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -484,8 +515,30 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -621,6 +674,7 @@ Designer + diff --git a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters index 4bb30fa911..28e404f217 100644 --- a/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters +++ b/build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters @@ -59,6 +59,12 @@ {e33e50a3-b742-4f4f-ae01-b233f27764c2} + + {bbb9abc2-fcf3-4341-8a22-20443e57d702} + + + {50bc6348-a253-45c5-a2f2-160932464451} + @@ -583,6 +589,72 @@ libcoco2d\2d + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base + @@ -1155,6 +1227,99 @@ libcoco2d\2d + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\3d + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base\allocator + + + libcoco2d\base + @@ -1166,6 +1331,9 @@ libcoco2d\math + + libcoco2d\3d +