summaryrefslogtreecommitdiff
path: root/uisimulator/x11
diff options
context:
space:
mode:
Diffstat (limited to 'uisimulator/x11')
-rw-r--r--uisimulator/x11/Makefile5
-rw-r--r--uisimulator/x11/kernel.h3
2 files changed, 7 insertions, 1 deletions
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
98MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c 98MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c playlist_menu.c
99 99
100ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) 100ifeq ($(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