Fixes for Android - finally I have some video output!

But it doesn't work on my PC now
This commit is contained in:
pelya
2009-11-25 15:35:03 +02:00
parent 425f67d787
commit 3e2bf0dfdf
7 changed files with 217 additions and 234 deletions

View File

@@ -60,7 +60,7 @@ int getopt(int nargc, char *const nargv[], const char *ostr)
}
if ((optopt = (int)*place++) == (int)':'
|| !(oli = strchr(ostr, optopt)))
|| !(oli = strchr((char *)ostr, optopt)))
{
/*
* if the user didn't specify '-' as an option,

View File

@@ -9,6 +9,8 @@
#include "../CLogFile.h"
#include "CInput.h" // for CInput::renderOverlay
#ifdef USE_OPENGL
#define GAME_STD_WIDTH 320
#define GAME_STD_HEIGHT 200
@@ -229,3 +231,5 @@ void COpenGL::render(bool withFG)
SDL_GL_SwapBuffers();
}
#endif

View File

@@ -14,6 +14,8 @@
#include <SDL.h>
#ifdef USE_OPENGL
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
#include <OpenGLES/ES1/gl.h>
#include <OpenGLES/ES1/glext.h>
@@ -49,3 +51,5 @@ private:
};
#endif
#endif

View File

@@ -314,7 +314,7 @@ bool CVideoDriver::applyMode(void)
m_Resolution = *m_Resolution_pos;
#ifndef WIZ
#if ! defined(WIZ) && ! defined(ANDROID)
// Support for doublebuffering
Mode |= SDL_DOUBLEBUF;
#endif