mirror of https://github.com/axmolengine/axmol.git
issue #1405: fixed some compile error on win32 and linux.
This commit is contained in:
parent
bf1a88ae06
commit
de2c00b7ae
|
@ -49,7 +49,7 @@ public:
|
|||
/**
|
||||
@brief Get target platform
|
||||
*/
|
||||
virtual TargetPlatform getTargetPlatform() = 0;
|
||||
virtual TargetPlatform getTargetPlatform();
|
||||
protected:
|
||||
long m_nAnimationInterval; //micro second
|
||||
|
||||
|
|
|
@ -142,7 +142,7 @@ void mousePosEventHandle(int iPosX,int iPosY) {
|
|||
}
|
||||
}
|
||||
|
||||
void CCEGLView::setSize(float width, float height)
|
||||
void CCEGLView::setFrameSize(float width, float height)
|
||||
{
|
||||
bool eResult = false;
|
||||
int u32GLFWFlags = GLFW_WINDOW;
|
||||
|
@ -200,7 +200,7 @@ void CCEGLView::setSize(float width, float height)
|
|||
/* Updates actual size */
|
||||
// glfwGetWindowSize(&width, &height);
|
||||
|
||||
CCEGLViewProtocol::setSize(width, height);
|
||||
CCEGLViewProtocol::setFrameSize(width, height);
|
||||
|
||||
/* Updates its title */
|
||||
glfwSetWindowTitle("Cocos2dx-Linux");
|
||||
|
|
|
@ -31,7 +31,7 @@ public:
|
|||
* iWidth ,height: the point size, which may scale.
|
||||
* iDepth is not the buffer depth of opengl, it indicate how may bits for a pixel
|
||||
*/
|
||||
virtual void setSize(float width, float height);
|
||||
virtual void setFrameSize(float width, float height);
|
||||
virtual bool isOpenGLReady();
|
||||
virtual void end();
|
||||
virtual void swapBuffers();
|
||||
|
|
|
@ -33,7 +33,7 @@ public:
|
|||
/**
|
||||
@brief Get target platform
|
||||
*/
|
||||
virtual TargetPlatform getTargetPlatform() = 0;
|
||||
virtual TargetPlatform getTargetPlatform();
|
||||
|
||||
protected:
|
||||
HINSTANCE m_hInstance;
|
||||
|
|
|
@ -11,6 +11,6 @@ int main(int argc, char **argv)
|
|||
AppDelegate app;
|
||||
CCApplication::sharedApplication().setResourceRootPath("../Resources/");
|
||||
CCEGLView& eglView = CCEGLView::sharedOpenGLView();
|
||||
eglView.setSize(960, 640 );
|
||||
eglView.setFrameSize(960, 640);
|
||||
return CCApplication::sharedApplication().run();
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ int main(int argc, char **argv) {
|
|||
AppDelegate app;
|
||||
CCApplication::sharedApplication().setResourceRootPath("../Resources/");
|
||||
CCEGLView& eglView = CCEGLView::sharedOpenGLView();
|
||||
eglView.setSize(480, 320 );
|
||||
eglView.setFrameSize(480, 320);
|
||||
|
||||
return CCApplication::sharedApplication().run();
|
||||
}
|
||||
|
|
|
@ -11,6 +11,6 @@ int main(int argc, char **argv) {
|
|||
AppDelegate app;
|
||||
CCApplication::sharedApplication().setResourceRootPath("../Resources/");
|
||||
CCEGLView& eglView = CCEGLView::sharedOpenGLView();
|
||||
eglView.setSize(480, 320 );
|
||||
eglView.setFrameSize(480, 320);
|
||||
return CCApplication::sharedApplication().run();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue