Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed compile errors on Maemo

Browse source
This commit is contained in:
Pali Rohár 2011-12-30 13:24:23 +01:00
parent c2cb48c3b9
commit b160633444
4 changed files with 10 additions and 8 deletions

2
CMakeLists.txt
View file

@ -583,7 +583,7 @@ if(MAEMO)
add_definitions(-DUSE_MAEMO ${LIBOSSO_CFLAGS})
include_directories(${LIBOSSO_INCLUDE_DIRS})
set(stratagus_SRCS ${stratagus_SRCS} ${maemo_SRCS})
set(stratagus_LIBS ${LIBOSSO_LIBRARIES})
set(stratagus_LIBS ${stratagus_LIBS} ${LIBOSSO_LIBRARIES})
# Hack/Bug: On Maemo is not possible to disable touch screen input
set(ENABLE_TOUCHSCREEN ON)
endif()

4
debian/control vendored
View file

@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 7), cmake (>= 2.6), doxygen,
zlib1g-dev, libbz2-dev, libpng12-dev (>= 1.2.5), libmng-dev,
libmikmod2-dev, libogg-dev, libvorbis-dev, libtheora-dev,
libsdl1.2-dev (>> 1.2.2), libosso-dev, libx11-dev, libsqlite3-dev,
libgl1-mesa-dev | libgl-dev | libgles1-sgx-img-dev | libgles1-mesa-dev,
libgl1-mesa-dev | libgl-dev | libsdl-gles1.2-dev
libgles1-sgx-img-dev | libglu1-mesa-dev | libglu-dev | libgles1-mesa-dev,
libsdl-gles1.2-dev | libglu1-mesa-dev | libglu-dev,
Standards-Version: 3.9.2
Homepage: https://launchpad.net/stratagus
Vcs-Browser: https://code.launchpad.net/stratagus

2
src/include/maemo.h
View file

@ -34,7 +34,7 @@
----------------------------------------------------------------------------*/
#ifdef USE_MAEMO
void maemo_init();
void maemo_init(void);
#endif
//@}

10
src/maemo/maemo.cpp
View file

@ -70,14 +70,14 @@ static Uint32 OssoKeepBacklightAlive(Uint32 interval, void *)
* Initialize OSSO context, needed for calling OSSO functions.
* Create SDL timer for calling OssoKeepBacklightAlive every 50s.
**/
static void OssoInitialize()
static void OssoInitialize(void)
{
char * application;
if (FullGameName.empty()) {
application = strdup("org.stratagus");
} else {
application = calloc(FullGameName.size() + 15, sizeof(char));
application = (char *)calloc(FullGameName.size() + 15, 1);
strcpy(application, "org.stratagus.");
for (int i = 0; i < FullGameName.size(); i++)
application[i+14] = tolower(FullGameName[i]);
@ -85,6 +85,8 @@ static void OssoInitialize()
osso = osso_initialize(application, VERSION, TRUE, NULL);
free(application);
if (!osso) {
fprintf(stderr, "Couldn't initialize OSSO\n");
exit(OSSO_ERROR);
@ -101,7 +103,7 @@ static void OssoInitialize()
/**
* Deinitialize OSSO context and remove registred SDL timer
**/
static void OssoDeinitialize()
static void OssoDeinitialize(void)
{
SDL_RemoveTimer(timer);
osso_deinitialize(osso);
@ -110,7 +112,7 @@ static void OssoDeinitialize()
/**
* Main function which initialize Maemo platform code
**/
void maemo_init()
void maemo_init(void)
{
OssoInitialize();
atexit(OssoDeinitialize);