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 = .
 
 TARGET = $(OBJDIR)/uisw32.exe
 
-#DISPLAY = -DHAVE_LCD_CHARCELLS
-DISPLAY = -DHAVE_LCD_BITMAP
-
-#KEYPAD = -DHAVE_PLAYER_KEYPAD
-KEYPAD = -DHAVE_RECORDER_KEYPAD
-
 DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR   \
 $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\"
 
@@ -68,6 +62,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c\
 MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c
 
 ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
+   DEFINES += -DLCD_PROPFONTS
    APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \
         widgets.c wormlet.c
 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 = .
 
 TARGET = $(OBJDIR)/rockboxui
 
-#DISPLAY = -DHAVE_LCD_CHARCELLS
-DISPLAY = -DHAVE_LCD_BITMAP
-
-#KEYPAD = -DHAVE_PLAYER_KEYPAD
-KEYPAD = -DHAVE_RECORDER_KEYPAD
-
 DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR   \
 $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES)
 
@@ -81,6 +75,10 @@ ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES)))
         FIRMSRCS += unicode.c ajf.c panic.c
         EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf
         SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf
+else
+ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
+   DEFINES += -DLCD_PROPFONTS
+endif
 endif
 
 APPS = main.c tree.c menu.c credits.c main_menu.c\