diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/Makefile | 7 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 10 |
2 files changed, 5 insertions, 12 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 7282afdc24..a45a4a6be6 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -36,12 +36,6 @@ OBJDIR = . | |||
36 | 36 | ||
37 | TARGET = $(OBJDIR)/uisw32.exe | 37 | TARGET = $(OBJDIR)/uisw32.exe |
38 | 38 | ||
39 | #DISPLAY = -DHAVE_LCD_CHARCELLS | ||
40 | DISPLAY = -DHAVE_LCD_BITMAP | ||
41 | |||
42 | #KEYPAD = -DHAVE_PLAYER_KEYPAD | ||
43 | KEYPAD = -DHAVE_RECORDER_KEYPAD | ||
44 | |||
45 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 39 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
46 | $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" | 40 | $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" |
47 | 41 | ||
@@ -68,6 +62,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c\ | |||
68 | MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c | 62 | MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c |
69 | 63 | ||
70 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 64 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
65 | DEFINES += -DLCD_PROPFONTS | ||
71 | APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \ | 66 | APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \ |
72 | widgets.c wormlet.c | 67 | widgets.c wormlet.c |
73 | endif | 68 | endif |
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 7a61c50ed3..f5856aa65b 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -36,12 +36,6 @@ OBJDIR = . | |||
36 | 36 | ||
37 | TARGET = $(OBJDIR)/rockboxui | 37 | TARGET = $(OBJDIR)/rockboxui |
38 | 38 | ||
39 | #DISPLAY = -DHAVE_LCD_CHARCELLS | ||
40 | DISPLAY = -DHAVE_LCD_BITMAP | ||
41 | |||
42 | #KEYPAD = -DHAVE_PLAYER_KEYPAD | ||
43 | KEYPAD = -DHAVE_RECORDER_KEYPAD | ||
44 | |||
45 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 39 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
46 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) | 40 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) |
47 | 41 | ||
@@ -81,6 +75,10 @@ ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES))) | |||
81 | FIRMSRCS += unicode.c ajf.c panic.c | 75 | FIRMSRCS += unicode.c ajf.c panic.c |
82 | EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf | 76 | EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf |
83 | SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf | 77 | SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf |
78 | else | ||
79 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | ||
80 | DEFINES += -DLCD_PROPFONTS | ||
81 | endif | ||
84 | endif | 82 | endif |
85 | 83 | ||
86 | APPS = main.c tree.c menu.c credits.c main_menu.c\ | 84 | APPS = main.c tree.c menu.c credits.c main_menu.c\ |