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

Fixes compilation issues on Android and Linux

This commit is contained in:
Ricardo Quesada 2014-01-30 17:28:12 -08:00
parent 5691829b72
commit c9dc113fa2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/platform/CCGLViewProtocol.h
View File

@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCEGLVIEWPROTOCOL_H__ #ifndef __CCGLVIEWPROTOCOL_H__
#define __CCEGLVIEWPROTOCOL_H__ #define __CCGLVIEWPROTOCOL_H__
#include "ccTypes.h" #include "ccTypes.h"
#include "CCEventTouch.h" #include "CCEventTouch.h"
@ -205,4 +205,4 @@ protected:
NS_CC_END NS_CC_END
#endif /* __CCEGLVIEWPROTOCOL_H__ */ #endif /* __CCGLVIEWPROTOCOL_H__ */

2
cocos/2d/platform/android/CCGLView.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "CCObject.h" #include "CCObject.h"
#include "CCGeometry.h" #include "CCGeometry.h"
#include "platform/CCEGLViewProtocol.h" #include "platform/CCGLViewProtocol.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/platform/android/nativeactivity.cpp
View File

@ -155,7 +155,7 @@ static void cocos_init(cocos_dimensions d, struct android_app* app)
auto glview = director->getOpenGLView(); auto glview = director->getOpenGLView();
if (!glview) if (!glview)
{ {
glview = cocos2d::EGLView::create("Android app"); glview = cocos2d::GLView::create("Android app");
glview->setFrameSize(d.w, d.h); glview->setFrameSize(d.w, d.h);
director->setOpenGLView(glview); director->setOpenGLView(glview);

2
cocos/2d/platform/linux/CCApplication.cpp
View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include <string> #include <string>
#include "CCDirector.h" #include "CCDirector.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "CCEGLView.h" #include "CCGLView.h"
NS_CC_BEGIN NS_CC_BEGIN