From c1bc26decd1ae00a87b2273c4f90d3093da37a2f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 3 Jan 2008 06:19:07 +0000 Subject: [PATCH] Updates for building on Windows CE using mingw32ce cross compiler: http://sourceforge.net/mailarchive/forum.php?thread_name 0703291652.38437.jwalt%40garni.ch&forum_name=cegcc-devel Hi! I just managed to compile SDL for Windows CE using the "mingw32ce" configuration of http://cegcc.sourceforge.net. Test programs work as expected (except for those using signals -- no POSIX on mingw32ce), and I didn't yet encounter any problem. While it was a pain to get everything compiled and running, the changes to SDL are actually quite small (see attached SDL-ce.diff). Unfortunately, the win32 headers shipped with cegcc are not 100% correct, and it feels quite messy to work around them in SDL code, so those headers will also need to be patched. (Attachment: win32api-ce.diff) Since I had to apply the libtool patch from the cegcc patch, I have also ad ded my copy of aclocal.m4 for SDL. I had to modify the cegcc libtool patch to use "lt_cv_deplibs_check_method=pass_all" for mingw32ce, otherwise libtool would not recognize the import libraries as valid for dynamic linking. All these changes should not affect non-WinCE builds, so they could be included in mainline SDL. If you need some docs, you can use this description for a cross-compilation README: 1) get cegcc from http://cegcc.sourceforge.net 2) build and install the "mingw32ce" variant (see cegcc installation docs) 3) patch w32api-headers (if not yet included in cegcc) 4) setup environment (customize the first three lines as you like): PREFIX=/opt/mingw32ce TARGET=arm-wince-mingw32ce BUILD=`uname -m`-pc-linux-gnu export PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PREFIX/local/bin:$PATH" export CFLAGS="${CFLAGS:- -O2 -g} -I$PREFIX/local/include" export CPPFLAGS="${CPPFLAGS:- -O2 -g} -I$PREFIX/local/include" export CXXFLAGS="${CXXFLAGS:- -O2 -g} -I$PREFIX/local/include" export LDFLAGS="${LDFLAGS:- -O2 -g} -L$PREFIX/local/lib" export HOST_CC="gcc" export CC="$PREFIX/bin/$TARGET-gcc" export CXX="$PREFIX/bin/$TARGET-g++" export LD="$PREFIX/bin/$TARGET-ld" export AS="$PREFIX/bin/$TARGET-as" export AR="$PREFIX/bin/$TARGET-ar" export RANLIB="$PREFIX/bin/$TARGET-ranlib" export CONFIG_SHELL="/bin/sh" 5) build and install ./configure --target=$TARGET --host=$TARGET --build=$BUILD make make install 6) use (4) and (5) for any SDL-using software you want to cross-compile 7) copy $PREFIX/local/bin/SDL-1-2-0.dll into your executable directory on the WinCE machine --- build-scripts/config.sub | 3 +++ configure.in | 43 +++++++++++++++++++++++++++++++++ src/video/gapi/SDL_gapivideo.c | 8 ++++++ src/video/gapi/SDL_gapivideo.h | 6 ++--- src/video/windib/SDL_dibvideo.c | 20 +++++++++++++++ 5 files changed, 77 insertions(+), 3 deletions(-) diff --git a/build-scripts/config.sub b/build-scripts/config.sub index 62d9cbe83..02186b885 100755 --- a/build-scripts/config.sub +++ b/build-scripts/config.sub @@ -1296,6 +1296,9 @@ case $os in -os400*) os=-os400 ;; + -cegcc*) + os=-cegcc + ;; -wince*) os=-wince ;; diff --git a/configure.in b/configure.in index 1a537767c..287e22434 100644 --- a/configure.in +++ b/configure.in @@ -2456,6 +2456,49 @@ case "$host" in SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows" ;; + *-wince*) + ARCH=win32 + CheckDummyVideo + CheckDiskAudio + CheckDummyAudio + CheckWIN32 + CheckNASM + SOURCES="$SOURCES $srcdir/src/video/gapi/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS -D_WIN32_WCE=0x420" + if test x$enable_audio = xyes; then + AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT) + SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" + have_audio=yes + fi + # Set up files for the thread library + if test x$enable_threads = xyes; then + AC_DEFINE(SDL_THREAD_WIN32) + SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" + SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" + SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" + SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" + have_threads=yes + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then + AC_DEFINE(SDL_TIMER_WINCE) + SOURCES="$SOURCES $srcdir/src/timer/wince/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lcoredll -lmmtimer" + have_timers=yes + fi + # Set up files for the shared object loading library + if test x$enable_loadso = xyes; then + AC_DEFINE(SDL_LOADSO_WIN32) + SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" + have_loadso=yes + fi + # Set up the system libraries we need + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lcoredll -lcommctrl" + # The Win32 platform requires special setup + SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" + SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420" + SDL_LIBS="-lSDLmain $SDL_LIBS" + ;; *-*-beos*) ARCH=beos ac_default_prefix=/boot/develop/tools/gnupro diff --git a/src/video/gapi/SDL_gapivideo.c b/src/video/gapi/SDL_gapivideo.c index 0dfce50cb..6d0ed9c13 100644 --- a/src/video/gapi/SDL_gapivideo.c +++ b/src/video/gapi/SDL_gapivideo.c @@ -71,6 +71,14 @@ Inspired by http://arisme.free.fr/ports/SDL.php #pragma message("Warning: Using GapiEmu in release build. I assume you'd like to set USE_GAPI_EMU to zero.") #endif +#ifndef _T +#define _T(x) L##x +#endif + +#ifndef ASSERT +#define ASSERT(x) +#endif + // defined and used in SDL_sysevents.c extern HINSTANCE aygshell; extern void SDL_UnregisterApp(); diff --git a/src/video/gapi/SDL_gapivideo.h b/src/video/gapi/SDL_gapivideo.h index 99a1d0009..1c22c06d2 100644 --- a/src/video/gapi/SDL_gapivideo.h +++ b/src/video/gapi/SDL_gapivideo.h @@ -132,13 +132,13 @@ struct SDL_PrivateVideoData { #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ int SDL_nummodes[NUM_MODELISTS]; SDL_Rect **SDL_modelist[NUM_MODELISTS]; - enum SDL_ScreenOrientation userOrientation; + SDL_ScreenOrientation userOrientation; int invert; char hiresFix; // using hires mode without defining hires resource // -------------- int useGXOpenDisplay; /* use GXOpenDispplay */ int w, h; - enum SDL_ScreenOrientation gapiOrientation; + SDL_ScreenOrientation gapiOrientation; void *buffer; // may be 8, 16, 24, 32 bpp PIXEL *videoMem; @@ -146,7 +146,7 @@ struct SDL_PrivateVideoData { struct GXKeyList keyList; struct GapiFunc gxFunc; struct GXDisplayProperties gxProperties; - enum GAPIVideoMode videoMode; + GAPIVideoMode videoMode; int colorscale; int dstLineStep; // in bytes int dstPixelStep; // in bytes diff --git a/src/video/windib/SDL_dibvideo.c b/src/video/windib/SDL_dibvideo.c index 71fa97c15..cfb2b5fd3 100644 --- a/src/video/windib/SDL_dibvideo.c +++ b/src/video/windib/SDL_dibvideo.c @@ -41,6 +41,26 @@ #include "../wincommon/SDL_wingl_c.h" #ifdef _WIN32_WCE + +#ifndef DM_DISPLAYORIENTATION +#define DM_DISPLAYORIENTATION 0x00800000L +#endif +#ifndef DM_DISPLAYQUERYORIENTATION +#define DM_DISPLAYQUERYORIENTATION 0x01000000L +#endif +#ifndef DMDO_0 +#define DMDO_0 0 +#endif +#ifndef DMDO_90 +#define DMDO_90 1 +#endif +#ifndef DMDO_180 +#define DMDO_180 2 +#endif +#ifndef DMDO_270 +#define DMDO_270 4 +#endif + #define NO_GETDIBITS #define NO_GAMMA_SUPPORT #if _WIN32_WCE < 420