diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index ca13181a46..55948b4cba 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\tests\cpp-tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" EndProject @@ -25,7 +25,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos 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}") = "TestLua", "..\tests\lua-tests\project\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" +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}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" EndProject diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj index 978d03e99f..50acd4842d 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj @@ -184,7 +184,7 @@ Disabled - $(EngineRoot);$(EngineRoot)cocos;$(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;%(AdditionalIncludeDirectories) + $(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;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -216,7 +216,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ MaxSpeed true - $(EngineRoot);$(EngineRoot)cocos;$(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;%(AdditionalIncludeDirectories) + $(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;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/tests/cpp-tests/proj.win32/TestCpp.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj similarity index 100% rename from tests/cpp-tests/proj.win32/TestCpp.vcxproj rename to tests/cpp-tests/proj.win32/cpp-tests.vcxproj diff --git a/tests/cpp-tests/proj.win32/TestCpp.vcxproj.filters b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters similarity index 100% rename from tests/cpp-tests/proj.win32/TestCpp.vcxproj.filters rename to tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters diff --git a/tests/cpp-tests/proj.win32/TestCpp.vcxproj.user b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.user similarity index 100% rename from tests/cpp-tests/proj.win32/TestCpp.vcxproj.user rename to tests/cpp-tests/proj.win32/cpp-tests.vcxproj.user diff --git a/tests/lua-tests/project/proj.win32/TestLua.rc b/tests/lua-tests/project/proj.win32/lua-tests.rc similarity index 87% rename from tests/lua-tests/project/proj.win32/TestLua.rc rename to tests/lua-tests/project/proj.win32/lua-tests.rc index 8b155d0f9a..01568f3af9 100644 --- a/tests/lua-tests/project/proj.win32/TestLua.rc +++ b/tests/lua-tests/project/proj.win32/lua-tests.rc @@ -42,7 +42,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDR_MAINFRAME ICON "res\\TestLua.ico" +IDR_MAINFRAME ICON "res\\lua-tests.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -67,12 +67,12 @@ BEGIN BLOCK "040904B0" BEGIN VALUE "CompanyName", "\0" - VALUE "FileDescription", "TestLua Module\0" + VALUE "FileDescription", "lua-tests Module\0" VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "TestLua\0" + VALUE "InternalName", "lua-tests\0" VALUE "LegalCopyright", "Copyright \0" - VALUE "OriginalFilename", "TestLua.exe\0" - VALUE "ProductName", "TestLua Module\0" + VALUE "OriginalFilename", "lua-tests.exe\0" + VALUE "ProductName", "lua-tests Module\0" VALUE "ProductVersion", "1, 0, 0, 1\0" END END diff --git a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj similarity index 95% rename from tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj rename to tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 66d853f657..fedc339b88 100644 --- a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -12,7 +12,7 @@ {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED} - TestLua + lua-tests @@ -95,11 +95,11 @@ false Win32 _DEBUG;%(PreprocessorDefinitions) - TestLua.h - TestLua_i.c - TestLua_p.c + lua-tests.h + lua-tests_i.c + lua-tests_p.c true - $(IntDir)/TestLua.tlb + $(IntDir)/lua-tests.tlb @@ -149,11 +149,11 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"false Win32 NDEBUG;%(PreprocessorDefinitions) - TestLua.h - TestLua_i.c - TestLua_p.c + lua-tests.h + lua-tests_i.c + lua-tests_p.c true - $(IntDir)/TestLua.tlb + $(IntDir)/lua-tests.tlb diff --git a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.filters b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.filters similarity index 100% rename from tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.filters rename to tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.filters diff --git a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.user b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.user similarity index 100% rename from tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.user rename to tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.user diff --git a/tests/lua-tests/project/proj.win32/res/TestLua.ico b/tests/lua-tests/project/proj.win32/res/lua-tests.ico similarity index 100% rename from tests/lua-tests/project/proj.win32/res/TestLua.ico rename to tests/lua-tests/project/proj.win32/res/lua-tests.ico diff --git a/tests/lua-tests/project/proj.win32/resource.h b/tests/lua-tests/project/proj.win32/resource.h index b64c0b240f..353824ff4c 100644 --- a/tests/lua-tests/project/proj.win32/resource.h +++ b/tests/lua-tests/project/proj.win32/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by TestLua.RC +// Used by lua-tests.RC // #define IDS_PROJNAME 100