From 6f763917a75bb43c727d73381c22699fffd158ca Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Wed, 6 Aug 2014 00:26:02 +0800 Subject: [PATCH] Delte liblua project for win32 and adjust cocos2d-win32 project --- build/cocos2d-win32.vc2012.sln | 6 - .../lua-bindings/proj.win32/liblua.vcxproj | 263 ------------ .../proj.win32/liblua.vcxproj.filters | 386 ------------------ .../proj.win32/liblua.vcxproj.user | 3 - 4 files changed, 658 deletions(-) delete mode 100644 cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj delete mode 100644 cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters delete mode 100644 cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index 17cffb4958..44afe74dca 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-t EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj.win32\cpp-empty-test.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}" @@ -65,10 +63,6 @@ Global {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj deleted file mode 100644 index 17d4be7a0a..0000000000 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj +++ /dev/null @@ -1,263 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - - {DDC3E27F-004D-4DD4-9DD3-931A013D2159} - liblua - Win32Proj - - - - StaticLibrary - Unicode - v100 - v110 - v110_xp - v120 - v120_xp - - - StaticLibrary - Unicode - v100 - v110 - v110_xp - v120 - v120_xp - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - Disabled - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - - - - - Level3 - OldStyle - 4800;4267;4251;4244;%(DisableSpecificWarnings) - true - - - %(AdditionalLibraryDirectories) - - - - - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$(OutDir)" - - - - - MinSpace - true - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - - - - - Level3 - None - 4800;4267;4251;4244;%(DisableSpecificWarnings) - true - false - - - libcocos2d.lib;%(AdditionalLibraryDirectories) - - - - - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$(OutDir)" - - - - - - \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters deleted file mode 100644 index 17e309c94c..0000000000 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters +++ /dev/null @@ -1,386 +0,0 @@ - - - - - {8d269c90-26ad-4ce8-b355-d8df01d59914} - - - {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} - - - {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} - - - {c36f2204-a252-47c0-b36c-b84cda218746} - - - {24fae6d6-ebb5-4da1-b0da-3f3845a9e9a9} - - - {cc863463-a948-487a-aacd-dc233c3e5200} - - - {1fa7ff75-c142-4928-8aef-e6a2eb2b465f} - - - - - auto - - - auto - - - auto - - - auto - - - auto - - - auto - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - tolua - - - tolua - - - tolua - - - tolua - - - tolua - - - xxtea - - - manual - - - auto - - - - - auto - - - auto - - - auto - - - auto - - - auto - - - auto - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - tolua - - - tolua - - - luajit - - - luajit - - - luajit - - - luajit - - - xxtea - - - manual - - - auto - - - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file