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

Merge remote branch 'origin/master'

This commit is contained in:
Walzer 2011-07-13 16:13:20 +08:00
parent 1b1fd7446c 692d8450c2
commit 62b52b37be
7 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HelloLua/win32/HelloLua.win32.vcxproj
View File

@ -120,7 +120,7 @@
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcocos2d.lib;libgles_cm.lib;libCocosDenshion.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libcocos2d.lib;libgles_cm.lib;liblua.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
231d95df880ff006a4a6af1f4330efd2a21b7fc7
7c86a753defd2521c1f21f2a1d1e8e028238553d

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

@ -94,7 +94,7 @@
<DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>libcocos2d.lib;libgles_cm.lib;libBox2d.lib;libchipmunk.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libcocos2d.lib;libgles_cm.lib;libBox2d.lib;libchipmunk.lib;libcurl_imp.lib;libCocosDenshion.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>

5
tests/tests/BugsTest/Bug-899.cpp
View File

@ -20,8 +20,3 @@ bool Bug899Layer::init()
}
return false;
}
Bug899Layer::~Bug899Layer()
{
CCDirector::sharedDirector()->enableRetinaDisplay(false);
}

1
tests/tests/BugsTest/Bug-899.h
View File

@ -6,7 +6,6 @@
class Bug899Layer : public BugsTestBaseLayer
{
public:
virtual ~Bug899Layer();
virtual bool init();
};

13
tests/tests/BugsTest/BugsTest.cpp
View File

@ -10,12 +10,12 @@
#include "Bug-1174.h"
#define TEST_BUG(bugNO) \
{ \
CCScene* pScene = CCScene::node(); \
Bug##bugNO##Layer* pLayer = new Bug##bugNO##Layer(); \
pLayer->init(); \
pScene->addChild(pLayer); \
CCDirector::sharedDirector()->replaceScene(pScene); \
{ \
CCScene* pScene = CCScene::node(); \
Bug##bugNO##Layer* pLayer = new Bug##bugNO##Layer(); \
pLayer->init(); \
pScene->addChild(pLayer); \
CCDirector::sharedDirector()->replaceScene(pScene); \
pLayer->autorelease(); \
}
@ -167,6 +167,7 @@ void BugsTestBaseLayer::onEnter()
void BugsTestBaseLayer::backCallback(CCObject* pSender)
{
CCDirector::sharedDirector()->enableRetinaDisplay(false);
BugsTestScene* pScene = new BugsTestScene();
pScene->runThisTest();
pScene->autorelease();

2
tests/tests/controller.cpp
View File

@ -113,7 +113,7 @@ static TestScene* CreateTestScene(int nIdx)
TestController::TestController()
: m_tBeginPos(CCPointZero)
{
CCDirector::sharedDirector()->setDeviceOrientation(CCDeviceOrientationPortrait);
//CCDirector::sharedDirector()->setDeviceOrientation(CCDeviceOrientationPortrait);
// add close menu
CCMenuItemImage *pCloseItem = CCMenuItemImage::itemFromNormalImage(s_pPathClose, s_pPathClose, this, menu_selector(TestController::closeCallback) );