From 35246b0810231e676c88e8fb5e662d8d21730aed Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Sat, 4 Jan 2014 12:25:12 +0800 Subject: [PATCH] fix compiling error and miss file on vs. --- cocos/2d/cocos2d.vcxproj | 2 +- .../proj.win32/libCocosBuilder.vcxproj | 1 + .../cocostudio/proj.win32/libCocosStudio.vcxproj | 1 + cocos/gui/proj.win32/libGUI.vcxproj | 1 + cocos/scripting/lua/bindings/liblua.vcxproj | 7 ++++++- .../scripting/lua/bindings/liblua.vcxproj.filters | 15 +++++++++++++++ extensions/proj.win32/libExtensions.vcxproj | 2 +- .../Lua/TestLua/proj.win32/TestLua.win32.vcxproj | 5 ++++- 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index 02b11faac0..90be6eac6d 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -81,7 +81,7 @@ Level3 - EditAndContinue + OldStyle 4267;4251;4244;%(DisableSpecificWarnings) true diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj index 98571622cf..f9bebc27e3 100644 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj +++ b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj @@ -63,6 +63,7 @@ true 4267;4251;4244;%(DisableSpecificWarnings) false + OldStyle true diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index 2947e0396d..eca9c14aef 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -151,6 +151,7 @@ true 4267;4251;4244;%(DisableSpecificWarnings) false + OldStyle true diff --git a/cocos/gui/proj.win32/libGUI.vcxproj b/cocos/gui/proj.win32/libGUI.vcxproj index 3cec8f360e..8d40d2cca4 100644 --- a/cocos/gui/proj.win32/libGUI.vcxproj +++ b/cocos/gui/proj.win32/libGUI.vcxproj @@ -104,6 +104,7 @@ true 4267;4251;4244;%(DisableSpecificWarnings) false + OldStyle true diff --git a/cocos/scripting/lua/bindings/liblua.vcxproj b/cocos/scripting/lua/bindings/liblua.vcxproj index 5006e34a8e..9fc1c1c521 100644 --- a/cocos/scripting/lua/bindings/liblua.vcxproj +++ b/cocos/scripting/lua/bindings/liblua.vcxproj @@ -76,7 +76,7 @@ Level3 - EditAndContinue + OldStyle 4800;4267;4251;4244;%(DisableSpecificWarnings) true @@ -131,6 +131,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ + @@ -146,6 +147,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ + @@ -161,6 +163,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ + @@ -176,6 +179,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ + @@ -185,6 +189,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ + diff --git a/cocos/scripting/lua/bindings/liblua.vcxproj.filters b/cocos/scripting/lua/bindings/liblua.vcxproj.filters index 5f7bbe6fb6..f90bdee1d7 100644 --- a/cocos/scripting/lua/bindings/liblua.vcxproj.filters +++ b/cocos/scripting/lua/bindings/liblua.vcxproj.filters @@ -99,6 +99,12 @@ cocos2dx_support + + cocos2dx_support\generated + + + cocos2dx_support + @@ -185,6 +191,12 @@ cocos2dx_support + + cocos2dx_support\generated + + + cocos2dx_support + @@ -196,5 +208,8 @@ cocos2dx_support\generated + + cocos2dx_support\generated + \ No newline at end of file diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj index 1e00952529..809221d8da 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libExtensions.vcxproj @@ -72,7 +72,7 @@ Level3 - EditAndContinue + OldStyle 4267;4251;4244;%(DisableSpecificWarnings) true diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj b/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj index b95a8da2f8..7d04e0f16c 100644 --- a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj +++ b/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj @@ -72,7 +72,7 @@ Level3 MultiThreadedDebugDLL false - EditAndContinue + OldStyle EnableFastChecks Disabled WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -184,6 +184,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ {b57cf53f-2e49-4031-9822-047cc0e6bde2} + + {b7c2a162-dec9-4418-972e-240ab3cbfcae} + {7e06e92c-537a-442b-9e4a-4761c84f8a1a}