mirror of https://github.com/axmolengine/axmol.git
Merge remote branch 'origin/master'
This commit is contained in:
commit
62b52b37be
|
@ -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>
|
||||
|
|
|
@ -1 +1 @@
|
|||
231d95df880ff006a4a6af1f4330efd2a21b7fc7
|
||||
7c86a753defd2521c1f21f2a1d1e8e028238553d
|
|
@ -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>
|
||||
|
|
|
@ -20,8 +20,3 @@ bool Bug899Layer::init()
|
|||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
Bug899Layer::~Bug899Layer()
|
||||
{
|
||||
CCDirector::sharedDirector()->enableRetinaDisplay(false);
|
||||
}
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
class Bug899Layer : public BugsTestBaseLayer
|
||||
{
|
||||
public:
|
||||
virtual ~Bug899Layer();
|
||||
virtual bool init();
|
||||
};
|
||||
|
||||
|
|
|
@ -167,6 +167,7 @@ void BugsTestBaseLayer::onEnter()
|
|||
|
||||
void BugsTestBaseLayer::backCallback(CCObject* pSender)
|
||||
{
|
||||
CCDirector::sharedDirector()->enableRetinaDisplay(false);
|
||||
BugsTestScene* pScene = new BugsTestScene();
|
||||
pScene->runThisTest();
|
||||
pScene->autorelease();
|
||||
|
|
|
@ -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) );
|
||||
|
|
Loading…
Reference in New Issue