wince fixes

This commit is contained in:
p.kosyh 2011-08-01 07:09:23 +00:00
parent 1539f651f3
commit e74f370572
4 changed files with 17 additions and 15 deletions

View file

@ -1,6 +1,6 @@
VERSION := 1.4.5 VERSION := 1.4.4
PREFIX=./ PREFIX=
DESTDIR= DESTDIR=
BIN=$(DESTDIR)$(PREFIX) BIN=$(DESTDIR)$(PREFIX)
@ -13,24 +13,22 @@ LANGPATH=$(DESTDIR)$(PREFIX)lang
MANPATH=$(DESTDIR)$(PREFIX)doc MANPATH=$(DESTDIR)$(PREFIX)doc
ZLIB_CFLAGS= ZLIB_CFLAGS=
ZLIB_LFLAGS= ZLIB_LFLAGS=-lz
LUA_CFLAGS= LUA_CFLAGS=
LUA_LFLAGS= LUA_LFLAGS=-llua
SDL_CFLAGS= SDL_CFLAGS=-I/opt/mingw32ce/arm-mingw32ce/include/SDL
SDL_LFLAGS= SDL_LFLAGS=-lmikmod -lpng
CFLAGS += -Wall -march=armv4t -Os -static \ CFLAGS += -Wall -march=armv4t -Os -static \
-D_HAVE_ICONV -D_USE_SDL_ICONV -D_LOCAL_APPDATA -D_SDL_MOD_BUG \ -D_HAVE_ICONV -D_USE_SDL_ICONV -D_LOCAL_APPDATA -D_SDL_MOD_BUG
$(shell sdl-config --cflags) $(shell libpng-config --cflags) $(shell liblua-config --cflags)
LDFLAGS += -Wl,-Bstatic \ LDFLAGS += -Wl,-Bstatic \
$(shell sdl-config --libs) \
-lSDL_mixer -lSDL -lmad -lvorbisfile -lvorbis -logg \ -lSDL_mixer -lSDL -lmad -lvorbisfile -lvorbis -logg \
-lSDL_ttf -lintl -lfreetype \ -lSDL_ttf -liconv -lfreetype \
-lSDL_image -lz $(shell libpng-config --libs) -ljpeg \ -lSDL_image -lz -ljpeg \
$(shell liblua-config --libs) \ -lmmtimer -lwince
-lmmtimer
CC=arm-mingw32ce-gcc CC=arm-mingw32ce-gcc
AR=arm-mingw32ce-ar rc AR=arm-mingw32ce-ar rc
@ -42,7 +40,7 @@ EXE=.exe
INSTALLD=install -d -m 0755 INSTALLD=install -d -m 0755
INSTALLB=install -m 0755 INSTALLB=install -m 0755
INSTALL=install -m 0644 INSTALL=install -m 0644
PLATFORM=windows.c iowin32.c PLATFORM=wince.c iowin32.c
RESOURCES=resources.o RESOURCES=resources.o
resources.o: resources.rc resources.o: resources.rc

View file

@ -126,6 +126,7 @@ int main(int argc, char *argv[])
#endif #endif
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
libwince_init(argv, 1);
wince_init(argv[0]); wince_init(argv[0]);
#else #else
#ifdef S60 #ifdef S60

View file

@ -1,3 +1,4 @@
#include "wince.h"
#include <windows.h> #include <windows.h>
#include <shlobj.h> #include <shlobj.h>
#include <limits.h> #include <limits.h>
@ -34,8 +35,8 @@ char *game_locale(void)
return strdup(buff); return strdup(buff);
} }
static char *game_codepage = NULL;
#if 0 #if 0
static char *game_codepage = NULL;
#ifdef _HAVE_ICONV #ifdef _HAVE_ICONV
static char *game_cp(void) static char *game_cp(void)
{ {
@ -168,6 +169,7 @@ char *app_dir( void )
} }
if (!access(appdir, W_OK)) if (!access(appdir, W_OK))
return appdir; return appdir;
return NULL;
} }
char *game_cfg_path( void ) char *game_cfg_path( void )

View file

@ -1,6 +1,7 @@
#ifndef _WINCE_EXTERNAL_H #ifndef _WINCE_EXTERNAL_H
#define _WINCE_EXTERNAL_H #define _WINCE_EXTERNAL_H
#define PATH_MAX 255
#define errno 0 #define errno 0
#define strerror(a) "" #define strerror(a) ""
#define putenv(a) ; #define putenv(a) ;