6 files changed, 30 insertions, 5 deletions

diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index d66fa6b2c4..42388b743d 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -100,7 +100,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \
         screens.c peakmeter.c sleeptimer.c keyboard.c onplay.c\
         misc.c plugin.c
 
-MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c
+MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c playlist_menu.c
 
 ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
    APPS += bmp.c widgets.c
@@ -160,6 +160,9 @@ $(OBJDIR)/demo_menu.o: $(APPDIR)/demo_menu.c
 $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
+$(OBJDIR)/playlist_menu.o: $(APPDIR)/playlist_menu.c
+        $(CC) $(APPCFLAGS) -c $< -o $@
+
 $(OBJDIR)/icons.o: $(MACHINEDIR)/icons.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
diff --git a/uisimulator/win32/file.h b/uisimulator/win32/file.h
index 4e13c8188e..1ba4e222cb 100644
--- a/uisimulator/win32/file.h
+++ b/uisimulator/win32/file.h
@@ -29,7 +29,7 @@ int win32_filesize(int fd);
 
 #define rename(x,y) win32_rename(x,y)
 #define filesize(x) win32_filesize(x)
-#define flush(x) _commit(x)
+#define fsync(x) _commit(x)
 
 #include "../../firmware/include/file.h"
 
diff --git a/uisimulator/win32/kernel.c b/uisimulator/win32/kernel.c
index 567ed9ee39..f2a9dbbb59 100644
--- a/uisimulator/win32/kernel.c
+++ b/uisimulator/win32/kernel.c
@@ -103,3 +103,15 @@ int set_irq_level (int level)
     static int _lv = 0;
     return (_lv = level);
 }
+
+void mutex_init(struct mutex *m)
+{
+}
+
+void mutex_lock(struct mutex *m)
+{
+}
+
+void mutex_unlock(struct mutex *m)
+{
+}
diff --git a/uisimulator/win32/rockbox.dsp b/uisimulator/win32/rockbox.dsp
index 558c256bfa..28340463fc 100644
--- a/uisimulator/win32/rockbox.dsp
+++ b/uisimulator/win32/rockbox.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../firmware/export" /I "../../firmware/drivers" /I "../../firmware/common" /I "../common" /I "../win32" /I "../../apps" /I "../../apps/recorder" /D "HAVE_LCD_BITMAP" /D "HAVE_RECORDER_KEYPAD" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "GETTIMEOFDAY_TWO_ARGS" /D "SIMULATOR" /D APPSVERSION=\"WIN32SIM\" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../firmware/export" /I "../../firmware/drivers" /I "../../firmware/common" /I "../common" /I "../win32" /I "../../apps" /I "../../apps/recorder" /D "HAVE_LCD_BITMAP" /D "HAVE_RECORDER_KEYPAD" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "GETTIMEOFDAY_TWO_ARGS" /D "SIMULATOR" /D APPSVERSION=\"WIN32SIM\" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../firmware/export" /I "../../firmware/drivers" /I "../../firmware/common" /I "../common" /I "../win32" /I "../../apps" /I "../../apps/player" /D "HAVE_LCD_CHARCELLS" /D "HAVE_PLAYER_KEYPAD" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "GETTIMEOFDAY_TWO_ARGS" /D "SIMULATOR" /D APPSVERSION=\"WIN32SIM\" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../firmware/export" /I "../../firmware/drivers" /I "../../firmware/common" /I "../common" /I "../win32" /I "../../apps" /I "../../apps/player" /D "HAVE_LCD_CHARCELLS" /D "HAVE_PLAYER_KEYPAD" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "GETTIMEOFDAY_TWO_ARGS" /D "SIMULATOR" /D APPSVERSION=\"WIN32SIM\" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -369,6 +369,10 @@ SOURCE=..\..\apps\playlist.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\apps\playlist_menu.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\apps\plugin.c
 # End Source File
 # Begin Source File
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index b501ea2462..05116edbd9 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -95,7 +95,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c language.c\
         screens.c peakmeter.c sleeptimer.c keyboard.c onplay.c\
         misc.c plugin.c
 
-MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c
+MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c playlist_menu.c
 
 ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
    APPS += bmp.c widgets.c
@@ -156,6 +156,9 @@ $(OBJDIR)/demo_menu.o: $(APPDIR)/demo_menu.c
 $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
+$(OBJDIR)/playlist_menu.o: $(APPDIR)/playlist_menu.c
+        $(CC) $(APPCFLAGS) -c $< -o $@
+
 $(OBJDIR)/icons.o: $(MACHINEDIR)/icons.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
diff --git a/uisimulator/x11/kernel.h b/uisimulator/x11/kernel.h
index 7ec2979748..a045a3f117 100644
--- a/uisimulator/x11/kernel.h
+++ b/uisimulator/x11/kernel.h
@@ -22,6 +22,9 @@
 #ifndef NO_REDEFINES_PLEASE
 
 #define sleep(x) x11_sleep(x)
+#define mutex_init(x) (void)x
+#define mutex_lock(x) (void)x
+#define mutex_unlock(x) (void)x
 
 #endif