diff --git a/Makefile.mingw32ce b/Rules.make.mingw32ce similarity index 62% rename from Makefile.mingw32ce rename to Rules.make.mingw32ce index d34c726..da4c939 100644 --- a/Makefile.mingw32ce +++ b/Rules.make.mingw32ce @@ -1,6 +1,6 @@ -VERSION := 1.4.5 +VERSION := 1.4.4 -PREFIX=./ +PREFIX= DESTDIR= BIN=$(DESTDIR)$(PREFIX) @@ -13,24 +13,22 @@ LANGPATH=$(DESTDIR)$(PREFIX)lang MANPATH=$(DESTDIR)$(PREFIX)doc ZLIB_CFLAGS= -ZLIB_LFLAGS= +ZLIB_LFLAGS=-lz LUA_CFLAGS= -LUA_LFLAGS= +LUA_LFLAGS=-llua -SDL_CFLAGS= -SDL_LFLAGS= +SDL_CFLAGS=-I/opt/mingw32ce/arm-mingw32ce/include/SDL +SDL_LFLAGS=-lmikmod -lpng CFLAGS += -Wall -march=armv4t -Os -static \ - -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) + -D_HAVE_ICONV -D_USE_SDL_ICONV -D_LOCAL_APPDATA -D_SDL_MOD_BUG + LDFLAGS += -Wl,-Bstatic \ - $(shell sdl-config --libs) \ -lSDL_mixer -lSDL -lmad -lvorbisfile -lvorbis -logg \ - -lSDL_ttf -lintl -lfreetype \ - -lSDL_image -lz $(shell libpng-config --libs) -ljpeg \ - $(shell liblua-config --libs) \ - -lmmtimer + -lSDL_ttf -liconv -lfreetype \ + -lSDL_image -lz -ljpeg \ + -lmmtimer -lwince CC=arm-mingw32ce-gcc AR=arm-mingw32ce-ar rc @@ -42,7 +40,7 @@ EXE=.exe INSTALLD=install -d -m 0755 INSTALLB=install -m 0755 INSTALL=install -m 0644 -PLATFORM=windows.c iowin32.c +PLATFORM=wince.c iowin32.c RESOURCES=resources.o resources.o: resources.rc diff --git a/src/sdl-instead/main.c b/src/sdl-instead/main.c index 1a4d417..13be100 100644 --- a/src/sdl-instead/main.c +++ b/src/sdl-instead/main.c @@ -126,6 +126,7 @@ int main(int argc, char *argv[]) #endif #ifdef _WIN32_WCE + libwince_init(argv, 1); wince_init(argv[0]); #else #ifdef S60 diff --git a/src/sdl-instead/wince.c b/src/sdl-instead/wince.c index a2b818e..155f571 100644 --- a/src/sdl-instead/wince.c +++ b/src/sdl-instead/wince.c @@ -1,3 +1,4 @@ +#include "wince.h" #include #include #include @@ -34,8 +35,8 @@ char *game_locale(void) return strdup(buff); } -static char *game_codepage = NULL; #if 0 +static char *game_codepage = NULL; #ifdef _HAVE_ICONV static char *game_cp(void) { @@ -168,6 +169,7 @@ char *app_dir( void ) } if (!access(appdir, W_OK)) return appdir; + return NULL; } char *game_cfg_path( void ) diff --git a/src/sdl-instead/wince.h b/src/sdl-instead/wince.h index b21579d..62b1bef 100644 --- a/src/sdl-instead/wince.h +++ b/src/sdl-instead/wince.h @@ -1,6 +1,7 @@ #ifndef _WINCE_EXTERNAL_H #define _WINCE_EXTERNAL_H +#define PATH_MAX 255 #define errno 0 #define strerror(a) "" #define putenv(a) ;