diff --git a/HelloLua/Classes/AppDelegate.cpp b/HelloLua/Classes/AppDelegate.cpp index f9afe42bff..c7b75caa4d 100644 --- a/HelloLua/Classes/AppDelegate.cpp +++ b/HelloLua/Classes/AppDelegate.cpp @@ -1,8 +1,10 @@ #include "AppDelegate.h" #include "cocos2d.h" +#include "SimpleAudioEngine.h" USING_NS_CC; +using namespace CocosDenshion; AppDelegate::AppDelegate() :m_pLuaEngine(NULL) @@ -11,6 +13,8 @@ AppDelegate::AppDelegate() AppDelegate::~AppDelegate() { + // end simple audio engine here, or it may crashed on win32 + SimpleAudioEngine::sharedEngine()->end(); CCScriptEngineManager::sharedScriptEngineManager()->removeScriptEngine(); CC_SAFE_DELETE(m_pLuaEngine); } diff --git a/cocos2d-win32.vc2008.sln b/cocos2d-win32.vc2008.sln index 46a8320a92..98c72b3ef7 100644 --- a/cocos2d-win32.vc2008.sln +++ b/cocos2d-win32.vc2008.sln @@ -26,6 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua\win32\ ProjectSection(ProjectDependencies) = postProject {DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159} {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" diff --git a/cocos2d-win32.vc2010.sln b/cocos2d-win32.vc2010.sln index 58279f7cfe..f8679dfbd7 100644 --- a/cocos2d-win32.vc2010.sln +++ b/cocos2d-win32.vc2010.sln @@ -14,6 +14,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.win32\test.win32.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua\win32\HelloLua.win32.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}" + ProjectSection(ProjectDependencies) = postProject + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" EndProject diff --git a/tests/test.win32/test.win32.vcxproj b/tests/test.win32/test.win32.vcxproj index ba74f22207..c9e0d0e023 100644 --- a/tests/test.win32/test.win32.vcxproj +++ b/tests/test.win32/test.win32.vcxproj @@ -121,6 +121,7 @@ + @@ -205,6 +206,7 @@ + diff --git a/tests/test.win32/test.win32.vcxproj.filters b/tests/test.win32/test.win32.vcxproj.filters index 7496d9c81f..ef2a4ecd58 100644 --- a/tests/test.win32/test.win32.vcxproj.filters +++ b/tests/test.win32/test.win32.vcxproj.filters @@ -130,6 +130,9 @@ {193709f6-8330-4eac-bda3-ff56f4c57e6c} + + {f50ced88-8293-41ef-a4cf-8e6f12be7066} + @@ -378,6 +381,9 @@ classes\tests\Texture2DTest + + classes\tests\FontTest + @@ -686,5 +692,8 @@ classes\tests\Texture2DTest + + classes\tests\FontTest + \ No newline at end of file