From 74f4d29fa944365eb5b1ea0cc0babbab283bed72 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Mon, 15 Jun 2015 20:06:54 -0700 Subject: [PATCH] added missing librecast --- .../HelloJavascript.Windows.vcxproj | 12 +++--- .../HelloJavascript.WindowsPhone.vcxproj | 8 ++-- .../proj.win8.1-universal/HelloJavascript.sln | 37 +++++++++++++++++++ .../App.Windows/js-tests.Windows.vcxproj | 12 +++--- .../js-tests.WindowsPhone.vcxproj | 8 ++-- 5 files changed, 57 insertions(+), 20 deletions(-) diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj index bb7027a4b7..428dd93a94 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj @@ -118,7 +118,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -131,7 +131,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -141,7 +141,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -154,7 +154,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -164,7 +164,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -177,7 +177,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj index c4f930c8ca..421c65bac3 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj @@ -85,7 +85,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -98,7 +98,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -108,7 +108,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false @@ -121,7 +121,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4453;28204;4756;%(DisableSpecificWarnings) + 4453;28204;4756;4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln index 6ba8f81a9a..344f3777ae 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln @@ -52,12 +52,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.Windows", "..\..\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.WindowsPhone", "..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.WindowsPhone\libbullet.WindowsPhone.vcxproj", "{E35634BD-B91B-4A6D-B957-96F56DD065F9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "librecast", "librecast", "{5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.Shared", "..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems", "{F39A11FB-0D36-4B0A-91F1-345F1F0C9AA9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.Windows", "..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Windows\librecast.Windows.vcxproj", "{19E35654-A3EC-48FA-BB21-082A2356C87C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.WindowsPhone", "..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.WindowsPhone\librecast.WindowsPhone.vcxproj", "{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\cocos2d-x\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4 + ..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{19e35654-a3ec-48fa-bb21-082a2356c87c}*SharedItemsImports = 4 App.Shared\HelloJavascript.Shared.vcxitems*{a3ad93e4-0b2f-4c58-9181-69bed2e42e3e}*SharedItemsImports = 9 ..\..\cocos2d-x\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{cc1da216-a80d-4be4-b309-acb6af313aff}*SharedItemsImports = 4 ..\..\cocos2d-x\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9 + ..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{f39a11fb-0d36-4b0a-91f1-345f1f0c9aa9}*SharedItemsImports = 9 ..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{e35634bd-b91b-4a6d-b957-96f56dd065f9}*SharedItemsImports = 4 App.Shared\HelloJavascript.Shared.vcxitems*{79a8fcda-4b12-4dd1-b676-ff148d651638}*SharedItemsImports = 4 ..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{ec2b1292-2d8c-4feb-a84b-2550b32c1ae7}*SharedItemsImports = 4 @@ -71,6 +81,7 @@ Global ..\..\cocos2d-x\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{22f3b9df-1209-4574-8331-003966f562bf}*SharedItemsImports = 4 ..\..\cocos2d-x\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{22f798d8-bfff-4754-996f-a5395343d5ec}*SharedItemsImports = 4 ..\..\cocos2d-x\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4 + ..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{d3bcfc1a-94bd-43b7-9c15-3f48ac6a9fac}*SharedItemsImports = 4 App.Shared\HelloJavascript.Shared.vcxitems*{396fe85e-bb05-4b92-bccb-f89aed4ea41a}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -224,6 +235,28 @@ Global {E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.ActiveCfg = Release|Win32 {E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.Build.0 = Release|Win32 {E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|x64.ActiveCfg = Release|Win32 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|ARM.ActiveCfg = Debug|ARM + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|ARM.Build.0 = Debug|ARM + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|Win32.ActiveCfg = Debug|Win32 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|Win32.Build.0 = Debug|Win32 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|x64.ActiveCfg = Debug|x64 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|x64.Build.0 = Debug|x64 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|ARM.ActiveCfg = Release|ARM + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|ARM.Build.0 = Release|ARM + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|Win32.ActiveCfg = Release|Win32 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|Win32.Build.0 = Release|Win32 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|x64.ActiveCfg = Release|x64 + {19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|x64.Build.0 = Release|x64 + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|ARM.ActiveCfg = Debug|ARM + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|ARM.Build.0 = Debug|ARM + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|Win32.ActiveCfg = Debug|Win32 + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|Win32.Build.0 = Debug|Win32 + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|x64.ActiveCfg = Debug|Win32 + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|ARM.ActiveCfg = Release|ARM + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|ARM.Build.0 = Release|ARM + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|Win32.ActiveCfg = Release|Win32 + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|Win32.Build.0 = Release|Win32 + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -250,5 +283,9 @@ Global {16AF311F-74CA-45A3-A82D-6334200FB124} = {74FBA998-B56C-4170-AF95-CFC4FFB40468} {EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7} = {74FBA998-B56C-4170-AF95-CFC4FFB40468} {E35634BD-B91B-4A6D-B957-96F56DD065F9} = {74FBA998-B56C-4170-AF95-CFC4FFB40468} + {5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4} = {F13CB4F7-BEE5-4368-A815-A971797387D8} + {F39A11FB-0D36-4B0A-91F1-345F1F0C9AA9} = {5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4} + {19E35654-A3EC-48FA-BB21-082A2356C87C} = {5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4} + {D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC} = {5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4} EndGlobalSection EndGlobal 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 63741c13a2..a447e4da36 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 @@ -119,7 +119,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -148,7 +148,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -174,7 +174,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -203,7 +203,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -229,7 +229,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -256,7 +256,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false 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 b3082a155d..e96e89ecfc 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 @@ -85,7 +85,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -98,7 +98,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -108,7 +108,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false @@ -121,7 +121,7 @@ /bigobj /Zm200 %(AdditionalOptions) - 4800;%(DisableSpecificWarnings) + 4800;4101;%(DisableSpecificWarnings) pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false