4 files changed, 59 insertions, 8 deletions

diff --git a/uisimulator/win32/makefile b/uisimulator/win32/makefile
index 0e93dcd855..11f16b3006 100644
--- a/uisimulator/win32/makefile
+++ b/uisimulator/win32/makefile
@@ -27,11 +27,11 @@ APPDIR = ../../apps/
 RECDIR = $(APPDIR)recorder/
 RM = del
 
-DISPLAY = -DHAVE_LCD_CHARCELLS
-#DISPLAY = -DHAVE_LCD_BITMAP
+#DISPLAY = -DHAVE_LCD_CHARCELLS
+DISPLAY = -DHAVE_LCD_BITMAP
 
-KEYPAD = -DHAVE_PLAYER_KEYPAD
-#KEYPAD = -DHAVE_RECORDER_KEYPAD
+#KEYPAD = -DHAVE_PLAYER_KEYPAD
+KEYPAD = -DHAVE_RECORDER_KEYPAD
 
 CC = cl
 DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR   \
@@ -46,10 +46,10 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb"
 SRCS = lcd-win32.c uisw32.c lcd.c button.c tree.c main.c \
   chartables.c kernel.c uisw32.res dir-win32.c main_menu.c \
   play.c debug-win32.c menu.c credits.c sound_menu.c mpeg.c \
-  id3.c settings.c sprintf.c thread-win32.c playlist.c
+  id3.c settings.c sprintf.c thread-win32.c playlist.c string-win32.c
 
 !IF ("$(DISPLAY)" == "-DHAVE_LCD_BITMAP")
-SRCS = $(SRCS) tetris.c screensaver.c icons.c bmp.c
+SRCS = $(SRCS) tetris.c boxes.c bounce.c sokoban.c icons.c bmp.c
 !ENDIF
 
 OBJS = $(SRCS:.c=.obj)
@@ -81,8 +81,14 @@ play.obj: ../../apps/play.c
 bmp.obj: ../../apps/recorder/bmp.c
  $(CC) $(CFLAGS) -c ../../apps/recorder/bmp.c -obmp.obj
 
-screensaver.obj: ../../apps/recorder/screensaver.c
- $(CC) $(CFLAGS) -c ../../apps/recorder/screensaver.c -oscreensaver.obj
+bounce.obj: ../../apps/recorder/bounce.c
+ $(CC) $(CFLAGS) -c ../../apps/recorder/bounce.c -obounce.obj
+
+sokoban.obj: ../../apps/recorder/sokoban.c
+ $(CC) $(CFLAGS) -c ../../apps/recorder/sokoban.c -osokoban.obj
+
+boxes.obj: ../../apps/recorder/boxes.c
+ $(CC) $(CFLAGS) -c ../../apps/recorder/boxes.c -oboxes.obj
 
 menu.obj: ../../apps/menu.c
  $(CC) $(CFLAGS) -c ../../apps/menu.c -omenu.obj
@@ -110,3 +116,4 @@ playlist.obj: ../../apps/playlist.c
 
 clean:
  $(RM) *.obj
+
diff --git a/uisimulator/win32/stdbool.h b/uisimulator/win32/stdbool.h
index a33fc40633..f081b4e4d0 100644
--- a/uisimulator/win32/stdbool.h
+++ b/uisimulator/win32/stdbool.h
@@ -1,3 +1,22 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Felix Arends
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
 typedef unsigned int bool;
 #define true        1
 #define false       0
\ No newline at end of file
diff --git a/uisimulator/win32/string-win32.c b/uisimulator/win32/string-win32.c
new file mode 100644
index 0000000000..4c24e939cd
--- /dev/null
+++ b/uisimulator/win32/string-win32.c
@@ -0,0 +1,25 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Felix Arends
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <string.h>
+
+int strcasecmp (const char *a, const char *b)
+{
+    return strcmpi (a, b);
+}
\ No newline at end of file
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo
index 569c42b853..1193c8e916 100644
--- a/uisimulator/win32/uisw32.suo
+++ b/uisimulator/win32/uisw32.suo