Index: tools/configure
===================================================================
--- tools/configure	(revision 12733)
+++ tools/configure	(working copy)
@@ -87,16 +87,14 @@
 
  output="rockboxui" # use this as default output binary name
 
- if [ "$simver" = "sdl" ]; then
-     # generic sdl-config checker
-     sdl=`findtool sdl-config`
+ # generic sdl-config checker
+ sdl=`findtool sdl-config`
 
-     if [ -z "$sdl" ]; then
-         echo "configure didn't find sdl-config, which indicates that you"
-         echo "don't have SDL (properly) installed. Please correct and"
-         echo "re-run configure!"
-         exit
-     fi
+ if [ -z "$sdl" ]; then
+     echo "configure didn't find sdl-config, which indicates that you"
+     echo "don't have SDL (properly) installed. Please correct and"
+     echo "re-run configure!"
+     exit
  fi
 
  case $uname in
@@ -104,21 +102,9 @@
    echo "Cygwin host detected"
 
    SHARED_FLAG="-shared"
-   if [ "$simver" = "win32" ]; then
-       # win32 version
-       GCCOPTS="$GCCOPTS -mno-cygwin -DNOCYGWIN"
-       LDOPTS="-lgdi32 -luser32 -mno-cygwin"
-   elif [ "$simver" = "sdl" ]; then
-       # sdl version
-       GCCOPTS="$GCCOPTS `sdl-config --cflags`"
-       LDOPTS="`sdl-config --libs` -mconsole"
-       checksoundcard
-   else
-       # x11 version
-       GCCOPTS="$GCCOPTS"
-       LDOPTS='-L/usr/X11R6/lib -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 -lpthread'
-       checksoundcard
-   fi
+   GCCOPTS="$GCCOPTS `sdl-config --cflags`"
+   LDOPTS="`sdl-config --libs` -mconsole"
+   checksoundcard
    output="rockboxui.exe" # use this as output binary name
    ;;
 
@@ -126,30 +112,19 @@
    echo "Linux host detected"
    GCCOPTS="$GCCOPTS"
    SHARED_FLAG="-shared"
-   if [ "$simver" = "win32" ]; then
-       LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread'
-       crosswincc # setup cross-compiler
-   elif [ "$simver" = "sdl" ]; then
-       if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then
-           # Enable crosscompiling if sdl-config is from Windows SDL
-           crosswincc
-       fi
-       GCCOPTS="$GCCOPTS `sdl-config --cflags`"
-       LDOPTS="`sdl-config --libs`"
-       checksoundcard
-   else
-       LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread'
-       checksoundcard
-   fi # not a cross-compiler
+   if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then
+       # Enable crosscompiling if sdl-config is from Windows SDL
+       crosswincc
+   fi
+   GCCOPTS="$GCCOPTS `sdl-config --cflags`"
+   LDOPTS="`sdl-config --libs`"
+   checksoundcard
    ;;
 
    FreeBSD)
    echo "FreeBSD host detected"
    LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -dl -lpthread'
    SHARED_FLAG="-shared"
-   if [ "$simver" = "win32" ]; then
-     crosswincc # setup cross-compiler
-   fi
    ;;
 
    Darwin)
@@ -330,45 +305,6 @@
   fi
 }
 
-whichsim () {
-
-if [ -z "$simver" ]; then
-
-  ##################################################################
-  # Figure out what simulator version
-  #
-  # x11 is deprecated so hide it from the question
-  # win32 is also deprecated
-  #
-  echo ""
-  echo "Build (S)DL version? (S)"
-
-  option=`input`;
-
-  case $option in
-   [Ww])
-     simver="win32"
-
-     WINDRES=windres
-     DLLTOOL=dlltool
-     DLLWRAP=dllwrap
-
-     # make sure the code knows this is for win32
-     extradefines="$extradefines -DWIN32"
-     ;;
-   [Xx])
-     simver="x11"
-     extradefines="$extradefines -DX11"
-     ;;
-   [Ss]|*)
-     simver="sdl"
-     extradefines="$extradefines -DSDL"
-     ;;
-   esac
-   echo "Selected $simver simulator"
-fi
-}
-
 voiceconfig () {
     echo "Building voice for $archos"
     echo ""
@@ -1301,31 +1237,6 @@
   echo "Platform set to $archos"
 
 
-#remove start
-############################################################################
-# Amount of memory, for those that can differ.
-#
-
-if [ "$memory" = "2" ]; then
-  size="2"
-  if [ -z "$update" ]; then
-    echo "Enter size of your RAM (in MB): (defaults to 2)"
-    size=`input`;
-  fi
-
-  case $size in
-   8)
-    memory="8"
-    ;;
-   *)
-    memory="2"
-    ;;
-
-  esac
-  echo "Memory size selected: $memory MB"
-fi
-#remove end
-
 ##################################################################
 # Figure out build "type"
 #
@@ -1372,7 +1283,8 @@
       simulator="yes"
       extradefines="-DSIMULATOR"
       echo "Simulator build selected"
-      whichsim
+      simver="sdl"
+      extradefines="$extradefines -DSDL"
       ;;
     [Aa])
       echo "Advanced build selected"