diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2007-04-20 11:58:39 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2007-04-20 11:58:39 +0000 |
| commit | f6209cc95961ad7ecc3be0dd95616fe86197a8f7 (patch) | |
| tree | bc678919776e101d2f9ff47e55ebfdd35dbf96f0 | |
| parent | 77854b7b920b78d1b0b522e57c041812c1db005a (diff) | |
| download | rockbox-f6209cc95961ad7ecc3be0dd95616fe86197a8f7.zip rockbox-f6209cc95961ad7ecc3be0dd95616fe86197a8f7.tar.gz rockbox-f6209cc95961ad7ecc3be0dd95616fe86197a8f7.tar.bz2 rockbox-f6209cc95961ad7ecc3be0dd95616fe86197a8f7.tar.xz | |
a little extra poke to get the sim to build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13215 a1c6a512-1295-4272-9138-f99709370657
| -rwxr-xr-x | tools/configure | 7 | ||||
| -rw-r--r-- | uisimulator/common/lcd-common.c | 8 | ||||
| -rw-r--r-- | uisimulator/sdl/sound.c | 3 |
3 files changed, 6 insertions, 12 deletions
diff --git a/tools/configure b/tools/configure index 4878d7c..759fedc 100755 --- a/tools/configure +++ b/tools/configure @@ -72,6 +72,7 @@ simcc () { # default tool setup for native building prefixtools "" + simver=sdl GCCOPTS='-W -Wall -g -fno-builtin' output="rockboxui" # use this as default output binary name @@ -134,6 +135,8 @@ simcc () { GCCOPTS="$GCCOPTS -fPIC" # needed to make shared objects link fi + GCCOPTS="$GCCOPTS -I\$(SIMDIR)" + if test "X$crosscompile" != "Xyes"; then id=$$ cat >/tmp/conftest-$id.c <<EOF @@ -1557,6 +1560,7 @@ sed > Makefile \ -e "s,@FIRMDIR@,${firmdir},g" \ -e "s,@TOOLSDIR@,${toolsdir},g" \ -e "s,@APPS@,${apps},g" \ + -e "s,@SIMVER@,${simver},g" \ -e "s,@GCCVER@,${gccver},g" \ -e "s,@GCCNUM@,${gccnum},g" \ -e "s,@UNAME@,${uname},g" \ @@ -1619,10 +1623,11 @@ export DLLTOOL=@DLLTOOL@ export DLLWRAP=@DLLWRAP@ export RANLIB=@RANLIB@ export PROFILE_OPTS=@PROFILE_OPTS@ +export SIMVER=@SIMVER@ +export SIMDIR=\$(ROOTDIR)/uisimulator/sdl export GCCOPTS=@GCCOPTS@ export TARGET_INC=@TARGET_INC@ export LOADADDRESS=@LOADADDRESS@ -export SIMDIR=\$(ROOTDIR)/uisimulator/sdl export SHARED_FLAG=@SHARED_FLAG@ export LDOPTS=@LDOPTS@ export GCCVER=@GCCVER@ diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c index a50745a..f9b374c 100644 --- a/uisimulator/common/lcd-common.c +++ b/uisimulator/common/lcd-common.c @@ -21,16 +21,8 @@ ****************************************************************************/ #include "lcd-common.h" - #include "lcd.h" - -#if defined(SDL) #include "lcd-sdl.h" -#elif defined(WIN32) -#include "lcd-win32.h" -#else -#include "lcd-x11.h" -#endif void lcd_blit(const fb_data* p_data, int x, int y, int width, int height, int stride) diff --git a/uisimulator/sdl/sound.c b/uisimulator/sdl/sound.c index 96cb987..eec9b3e 100644 --- a/uisimulator/sdl/sound.c +++ b/uisimulator/sdl/sound.c @@ -19,8 +19,6 @@ #include "autoconf.h" -#ifdef ROCKBOX_HAS_SIMSOUND /* play sound in sim enabled */ - #include <stdlib.h> #include <stdbool.h> #include <memory.h> @@ -320,5 +318,4 @@ void pcm_postinit(void) { } -#endif /* ROCKBOX_HAS_SIMSOUND */ |