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.tar.gz rockbox-f6209cc95961ad7ecc3be0dd95616fe86197a8f7.zip |
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 4878d7ce95..759fedc7e9 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -72,6 +72,7 @@ simcc () { | |||
72 | # default tool setup for native building | 72 | # default tool setup for native building |
73 | prefixtools "" | 73 | prefixtools "" |
74 | 74 | ||
75 | simver=sdl | ||
75 | GCCOPTS='-W -Wall -g -fno-builtin' | 76 | GCCOPTS='-W -Wall -g -fno-builtin' |
76 | 77 | ||
77 | output="rockboxui" # use this as default output binary name | 78 | output="rockboxui" # use this as default output binary name |
@@ -134,6 +135,8 @@ simcc () { | |||
134 | GCCOPTS="$GCCOPTS -fPIC" # needed to make shared objects link | 135 | GCCOPTS="$GCCOPTS -fPIC" # needed to make shared objects link |
135 | fi | 136 | fi |
136 | 137 | ||
138 | GCCOPTS="$GCCOPTS -I\$(SIMDIR)" | ||
139 | |||
137 | if test "X$crosscompile" != "Xyes"; then | 140 | if test "X$crosscompile" != "Xyes"; then |
138 | id=$$ | 141 | id=$$ |
139 | cat >/tmp/conftest-$id.c <<EOF | 142 | cat >/tmp/conftest-$id.c <<EOF |
@@ -1557,6 +1560,7 @@ sed > Makefile \ | |||
1557 | -e "s,@FIRMDIR@,${firmdir},g" \ | 1560 | -e "s,@FIRMDIR@,${firmdir},g" \ |
1558 | -e "s,@TOOLSDIR@,${toolsdir},g" \ | 1561 | -e "s,@TOOLSDIR@,${toolsdir},g" \ |
1559 | -e "s,@APPS@,${apps},g" \ | 1562 | -e "s,@APPS@,${apps},g" \ |
1563 | -e "s,@SIMVER@,${simver},g" \ | ||
1560 | -e "s,@GCCVER@,${gccver},g" \ | 1564 | -e "s,@GCCVER@,${gccver},g" \ |
1561 | -e "s,@GCCNUM@,${gccnum},g" \ | 1565 | -e "s,@GCCNUM@,${gccnum},g" \ |
1562 | -e "s,@UNAME@,${uname},g" \ | 1566 | -e "s,@UNAME@,${uname},g" \ |
@@ -1619,10 +1623,11 @@ export DLLTOOL=@DLLTOOL@ | |||
1619 | export DLLWRAP=@DLLWRAP@ | 1623 | export DLLWRAP=@DLLWRAP@ |
1620 | export RANLIB=@RANLIB@ | 1624 | export RANLIB=@RANLIB@ |
1621 | export PROFILE_OPTS=@PROFILE_OPTS@ | 1625 | export PROFILE_OPTS=@PROFILE_OPTS@ |
1626 | export SIMVER=@SIMVER@ | ||
1627 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | ||
1622 | export GCCOPTS=@GCCOPTS@ | 1628 | export GCCOPTS=@GCCOPTS@ |
1623 | export TARGET_INC=@TARGET_INC@ | 1629 | export TARGET_INC=@TARGET_INC@ |
1624 | export LOADADDRESS=@LOADADDRESS@ | 1630 | export LOADADDRESS=@LOADADDRESS@ |
1625 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | ||
1626 | export SHARED_FLAG=@SHARED_FLAG@ | 1631 | export SHARED_FLAG=@SHARED_FLAG@ |
1627 | export LDOPTS=@LDOPTS@ | 1632 | export LDOPTS=@LDOPTS@ |
1628 | export GCCVER=@GCCVER@ | 1633 | export GCCVER=@GCCVER@ |
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c index a50745a334..f9b374cf81 100644 --- a/uisimulator/common/lcd-common.c +++ b/uisimulator/common/lcd-common.c | |||
@@ -21,16 +21,8 @@ | |||
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | 22 | ||
23 | #include "lcd-common.h" | 23 | #include "lcd-common.h" |
24 | |||
25 | #include "lcd.h" | 24 | #include "lcd.h" |
26 | |||
27 | #if defined(SDL) | ||
28 | #include "lcd-sdl.h" | 25 | #include "lcd-sdl.h" |
29 | #elif defined(WIN32) | ||
30 | #include "lcd-win32.h" | ||
31 | #else | ||
32 | #include "lcd-x11.h" | ||
33 | #endif | ||
34 | 26 | ||
35 | void lcd_blit(const fb_data* p_data, int x, int y, int width, int height, | 27 | void lcd_blit(const fb_data* p_data, int x, int y, int width, int height, |
36 | int stride) | 28 | int stride) |
diff --git a/uisimulator/sdl/sound.c b/uisimulator/sdl/sound.c index 96cb9874f5..eec9b3e78b 100644 --- a/uisimulator/sdl/sound.c +++ b/uisimulator/sdl/sound.c | |||
@@ -19,8 +19,6 @@ | |||
19 | 19 | ||
20 | #include "autoconf.h" | 20 | #include "autoconf.h" |
21 | 21 | ||
22 | #ifdef ROCKBOX_HAS_SIMSOUND /* play sound in sim enabled */ | ||
23 | |||
24 | #include <stdlib.h> | 22 | #include <stdlib.h> |
25 | #include <stdbool.h> | 23 | #include <stdbool.h> |
26 | #include <memory.h> | 24 | #include <memory.h> |
@@ -320,5 +318,4 @@ void pcm_postinit(void) | |||
320 | { | 318 | { |
321 | } | 319 | } |
322 | 320 | ||
323 | #endif /* ROCKBOX_HAS_SIMSOUND */ | ||
324 | 321 | ||