diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/Makefile | 5 | ||||
-rw-r--r-- | uisimulator/win32/file.h | 2 | ||||
-rw-r--r-- | uisimulator/win32/kernel.c | 12 | ||||
-rw-r--r-- | uisimulator/win32/rockbox.dsp | 8 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 5 | ||||
-rw-r--r-- | uisimulator/x11/kernel.h | 3 |
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 \ | |||
100 | screens.c peakmeter.c sleeptimer.c keyboard.c onplay.c\ | 100 | screens.c peakmeter.c sleeptimer.c keyboard.c onplay.c\ |
101 | misc.c plugin.c | 101 | misc.c plugin.c |
102 | 102 | ||
103 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c | 103 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c playlist_menu.c |
104 | 104 | ||
105 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 105 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
106 | APPS += bmp.c widgets.c | 106 | APPS += bmp.c widgets.c |
@@ -160,6 +160,9 @@ $(OBJDIR)/demo_menu.o: $(APPDIR)/demo_menu.c | |||
160 | $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c | 160 | $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c |
161 | $(CC) $(APPCFLAGS) -c $< -o $@ | 161 | $(CC) $(APPCFLAGS) -c $< -o $@ |
162 | 162 | ||
163 | $(OBJDIR)/playlist_menu.o: $(APPDIR)/playlist_menu.c | ||
164 | $(CC) $(APPCFLAGS) -c $< -o $@ | ||
165 | |||
163 | $(OBJDIR)/icons.o: $(MACHINEDIR)/icons.c | 166 | $(OBJDIR)/icons.o: $(MACHINEDIR)/icons.c |
164 | $(CC) $(APPCFLAGS) -c $< -o $@ | 167 | $(CC) $(APPCFLAGS) -c $< -o $@ |
165 | 168 | ||
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); | |||
29 | 29 | ||
30 | #define rename(x,y) win32_rename(x,y) | 30 | #define rename(x,y) win32_rename(x,y) |
31 | #define filesize(x) win32_filesize(x) | 31 | #define filesize(x) win32_filesize(x) |
32 | #define flush(x) _commit(x) | 32 | #define fsync(x) _commit(x) |
33 | 33 | ||
34 | #include "../../firmware/include/file.h" | 34 | #include "../../firmware/include/file.h" |
35 | 35 | ||
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) | |||
103 | static int _lv = 0; | 103 | static int _lv = 0; |
104 | return (_lv = level); | 104 | return (_lv = level); |
105 | } | 105 | } |
106 | |||
107 | void mutex_init(struct mutex *m) | ||
108 | { | ||
109 | } | ||
110 | |||
111 | void mutex_lock(struct mutex *m) | ||
112 | { | ||
113 | } | ||
114 | |||
115 | void mutex_unlock(struct mutex *m) | ||
116 | { | ||
117 | } | ||
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 | |||
43 | # PROP Ignore_Export_Lib 0 | 43 | # PROP Ignore_Export_Lib 0 |
44 | # PROP Target_Dir "" | 44 | # PROP Target_Dir "" |
45 | # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c | 45 | # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c |
46 | # 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 | 46 | # 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 |
47 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | 47 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
48 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | 48 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
49 | # ADD BASE RSC /l 0x407 /d "_DEBUG" | 49 | # ADD BASE RSC /l 0x407 /d "_DEBUG" |
@@ -69,7 +69,7 @@ LINK32=link.exe | |||
69 | # PROP Ignore_Export_Lib 0 | 69 | # PROP Ignore_Export_Lib 0 |
70 | # PROP Target_Dir "" | 70 | # PROP Target_Dir "" |
71 | # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c | 71 | # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c |
72 | # 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 | 72 | # 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 |
73 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | 73 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
74 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | 74 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
75 | # ADD BASE RSC /l 0x407 /d "_DEBUG" | 75 | # ADD BASE RSC /l 0x407 /d "_DEBUG" |
@@ -369,6 +369,10 @@ SOURCE=..\..\apps\playlist.c | |||
369 | # End Source File | 369 | # End Source File |
370 | # Begin Source File | 370 | # Begin Source File |
371 | 371 | ||
372 | SOURCE=..\..\apps\playlist_menu.c | ||
373 | # End Source File | ||
374 | # Begin Source File | ||
375 | |||
372 | SOURCE=..\..\apps\plugin.c | 376 | SOURCE=..\..\apps\plugin.c |
373 | # End Source File | 377 | # End Source File |
374 | # Begin Source File | 378 | # 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\ | |||
95 | screens.c peakmeter.c sleeptimer.c keyboard.c onplay.c\ | 95 | screens.c peakmeter.c sleeptimer.c keyboard.c onplay.c\ |
96 | misc.c plugin.c | 96 | misc.c plugin.c |
97 | 97 | ||
98 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c | 98 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c playlist_menu.c |
99 | 99 | ||
100 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 100 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
101 | APPS += bmp.c widgets.c | 101 | APPS += bmp.c widgets.c |
@@ -156,6 +156,9 @@ $(OBJDIR)/demo_menu.o: $(APPDIR)/demo_menu.c | |||
156 | $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c | 156 | $(OBJDIR)/settings_menu.o: $(APPDIR)/settings_menu.c |
157 | $(CC) $(APPCFLAGS) -c $< -o $@ | 157 | $(CC) $(APPCFLAGS) -c $< -o $@ |
158 | 158 | ||
159 | $(OBJDIR)/playlist_menu.o: $(APPDIR)/playlist_menu.c | ||
160 | $(CC) $(APPCFLAGS) -c $< -o $@ | ||
161 | |||
159 | $(OBJDIR)/icons.o: $(MACHINEDIR)/icons.c | 162 | $(OBJDIR)/icons.o: $(MACHINEDIR)/icons.c |
160 | $(CC) $(APPCFLAGS) -c $< -o $@ | 163 | $(CC) $(APPCFLAGS) -c $< -o $@ |
161 | 164 | ||
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 @@ | |||
22 | #ifndef NO_REDEFINES_PLEASE | 22 | #ifndef NO_REDEFINES_PLEASE |
23 | 23 | ||
24 | #define sleep(x) x11_sleep(x) | 24 | #define sleep(x) x11_sleep(x) |
25 | #define mutex_init(x) (void)x | ||
26 | #define mutex_lock(x) (void)x | ||
27 | #define mutex_unlock(x) (void)x | ||
25 | 28 | ||
26 | #endif | 29 | #endif |
27 | 30 | ||