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

Merge pull request #2946 from dumganhar/develop 

Compilation Fixes for WIN32
This commit is contained in:
James Chen 2013-06-20 03:05:13 -07:00
parent b37fbfdcc8 8b2b95ab4d
commit 358cbde2a1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/actions/CCAction.h
View File

@ -46,7 +46,7 @@ enum {
/** /**
@brief Base class for Action objects. @brief Base class for Action objects.
*/ */
class CC_DLL Action : public Object, public Clonable class CC_DLL Action : public Clonable, public Object
{ {
public: public:
Action(void); Action(void);

2
cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
View File

@ -402,7 +402,7 @@ void Layer::onExit()
// remove this layer from the delegates who concern Accelerometer Sensor // remove this layer from the delegates who concern Accelerometer Sensor
if (_accelerometerEnabled) if (_accelerometerEnabled)
{ {
pDirector->getAccelerometer()->setDelegate(NULL); pDirector->getAccelerometer()->setDelegate(nullptr);
} }
// remove this layer from the delegates who concern the keypad msg // remove this layer from the delegates who concern the keypad msg

1
cocos2dx/support/zip_support/ZipUtils.h
View File

@ -25,6 +25,7 @@ THE SOFTWARE.
#define __SUPPORT_ZIPUTILS_H__ #define __SUPPORT_ZIPUTILS_H__
#include <string> #include <string>
#include "platform/CCPlatformConfig.h"
#include "CCPlatformDefine.h" #include "CCPlatformDefine.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)