Permalink
Browse files

all tests works ok on vs2010 & fix a bug that HelloLua may crashed on…

… win32 when it eixt
  • Loading branch information...
1 parent 33025aa commit 3d3281568bc8daa8e69733a577c477bbce51bbe8 @minggo minggo committed Aug 17, 2011
@@ -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);
}
View
@@ -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}"
View
@@ -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
@@ -121,6 +121,7 @@
<ClCompile Include="..\tests\BugsTest\Bug-914.cpp" />
<ClCompile Include="..\tests\BugsTest\BugsTest.cpp" />
<ClCompile Include="..\tests\DirectorTest\DirectorTest.cpp" />
+ <ClCompile Include="..\tests\FontTest\FontTest.cpp" />
<ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="..\AppDelegate.cpp" />
@@ -205,6 +206,7 @@
<ClInclude Include="..\tests\BugsTest\Bug-914.h" />
<ClInclude Include="..\tests\BugsTest\BugsTest.h" />
<ClInclude Include="..\tests\DirectorTest\DirectorTest.h" />
+ <ClInclude Include="..\tests\FontTest\FontTest.h" />
<ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h" />
<ClInclude Include="main.h" />
<ClInclude Include="..\AppDelegate.h" />
@@ -130,6 +130,9 @@
<Filter Include="classes\tests\Texture2DTest">
<UniqueIdentifier>{193709f6-8330-4eac-bda3-ff56f4c57e6c}</UniqueIdentifier>
</Filter>
+ <Filter Include="classes\tests\FontTest">
+ <UniqueIdentifier>{f50ced88-8293-41ef-a4cf-8e6f12be7066}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
@@ -378,6 +381,9 @@
<ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp">
<Filter>classes\tests\Texture2DTest</Filter>
</ClCompile>
+ <ClCompile Include="..\tests\FontTest\FontTest.cpp">
+ <Filter>classes\tests\FontTest</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="main.h">
@@ -686,5 +692,8 @@
<ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h">
<Filter>classes\tests\Texture2DTest</Filter>
</ClInclude>
+ <ClInclude Include="..\tests\FontTest\FontTest.h">
+ <Filter>classes\tests\FontTest</Filter>
+ </ClInclude>
</ItemGroup>
</Project>

0 comments on commit 3d32815

Please sign in to comment.