Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt

This commit is contained in:
minggo 2011-08-17 18:24:36 +08:00
parent d721f4d3c0
commit ab781654d7
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HelloLua/Classes/AppDelegate.cpp
View File

@ -1,8 +1,10 @@
#include "AppDelegate.h" #include "AppDelegate.h"
#include "cocos2d.h" #include "cocos2d.h"
#include "SimpleAudioEngine.h"
USING_NS_CC; USING_NS_CC;
using namespace CocosDenshion;
AppDelegate::AppDelegate() AppDelegate::AppDelegate()
:m_pLuaEngine(NULL) :m_pLuaEngine(NULL)
@ -11,6 +13,8 @@ AppDelegate::AppDelegate()
AppDelegate::~AppDelegate() AppDelegate::~AppDelegate()
{ {
// end simple audio engine here, or it may crashed on win32
SimpleAudioEngine::sharedEngine()->end();
CCScriptEngineManager::sharedScriptEngineManager()->removeScriptEngine(); CCScriptEngineManager::sharedScriptEngineManager()->removeScriptEngine();
CC_SAFE_DELETE(m_pLuaEngine); CC_SAFE_DELETE(m_pLuaEngine);
} }

1
cocos2d-win32.vc2008.sln
View File

@ -26,6 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua\win32\
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159} {DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159}
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"

3
cocos2d-win32.vc2010.sln
View File

@ -14,6 +14,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.win32\test.win32.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\test.win32\test.win32.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua\win32\HelloLua.win32.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}" 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "lua\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
EndProject EndProject

2
tests/test.win32/test.win32.vcxproj
View File

@ -121,6 +121,7 @@
<ClCompile Include="..\tests\BugsTest\Bug-914.cpp" /> <ClCompile Include="..\tests\BugsTest\Bug-914.cpp" />
<ClCompile Include="..\tests\BugsTest\BugsTest.cpp" /> <ClCompile Include="..\tests\BugsTest\BugsTest.cpp" />
<ClCompile Include="..\tests\DirectorTest\DirectorTest.cpp" /> <ClCompile Include="..\tests\DirectorTest\DirectorTest.cpp" />
<ClCompile Include="..\tests\FontTest\FontTest.cpp" />
<ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp" /> <ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="..\AppDelegate.cpp" /> <ClCompile Include="..\AppDelegate.cpp" />
@ -205,6 +206,7 @@
<ClInclude Include="..\tests\BugsTest\Bug-914.h" /> <ClInclude Include="..\tests\BugsTest\Bug-914.h" />
<ClInclude Include="..\tests\BugsTest\BugsTest.h" /> <ClInclude Include="..\tests\BugsTest\BugsTest.h" />
<ClInclude Include="..\tests\DirectorTest\DirectorTest.h" /> <ClInclude Include="..\tests\DirectorTest\DirectorTest.h" />
<ClInclude Include="..\tests\FontTest\FontTest.h" />
<ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h" /> <ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h" />
<ClInclude Include="main.h" /> <ClInclude Include="main.h" />
<ClInclude Include="..\AppDelegate.h" /> <ClInclude Include="..\AppDelegate.h" />

9
tests/test.win32/test.win32.vcxproj.filters
View File

@ -130,6 +130,9 @@
<Filter Include="classes\tests\Texture2DTest"> <Filter Include="classes\tests\Texture2DTest">
<UniqueIdentifier>{193709f6-8330-4eac-bda3-ff56f4c57e6c}</UniqueIdentifier> <UniqueIdentifier>{193709f6-8330-4eac-bda3-ff56f4c57e6c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="classes\tests\FontTest">
<UniqueIdentifier>{f50ced88-8293-41ef-a4cf-8e6f12be7066}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
@ -378,6 +381,9 @@
<ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp"> <ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp">
<Filter>classes\tests\Texture2DTest</Filter> <Filter>classes\tests\Texture2DTest</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\tests\FontTest\FontTest.cpp">
<Filter>classes\tests\FontTest</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="main.h"> <ClInclude Include="main.h">
@ -686,5 +692,8 @@
<ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h"> <ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h">
<Filter>classes\tests\Texture2DTest</Filter> <Filter>classes\tests\Texture2DTest</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\tests\FontTest\FontTest.h">
<Filter>classes\tests\FontTest</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>