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 () {
  # 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 a50745a334..f9b374cf81 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 96cb9874f5..eec9b3e78b 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 */