5 files changed, 11 insertions, 29 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 8ec3b0a581..07b093eb40 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -17,11 +17,6 @@ FIRMWARE := ../firmware
 
 INCLUDES= -I$(FIRMWARE)/include -I$(FIRMWARE) -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I$(FIRMWARE)/malloc -I.
 
-# Pick a target to build for
-#TARGET = -DARCHOS_PLAYER=1
-TARGET = -DARCHOS_PLAYER_OLD=1
-#TARGET = -DARCHOS_RECORDER=1
-
 # store output files in this directory:
 OBJDIR = .
 
diff --git a/firmware/Makefile b/firmware/Makefile
index aab5249b25..252b1ea70b 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -17,11 +17,6 @@ INCLUDES=-Iinclude -I. -Icommon -Idrivers
 
 SYSTEM_FONT = fonts/alt6x10.bdf
 
-# Pick a target to build for
-TARGET = -DARCHOS_PLAYER=1
-#TARGET = -DARCHOS_PLAYER_OLD=1
-#TARGET = -DARCHOS_RECORDER=1
-
 # store output files in this directory:
 OBJDIR = .
 
@@ -43,8 +38,13 @@ DIRS = $(subst $(DEPS),".",$(DEPDIRS))
 
 OUTPUT = $(OBJDIR)/librockbox.a
 
+
 ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
         EXTRA_TARGETS = $(OBJDIR)/system.ajf
+else
+ifeq ($(TARGET),-DARCHOS_RECORDER)
+        CFLAGS += -DLCD_PROPFONTS
+endif
 endif
 
 all: $(OUTPUT) $(EXTRA_TARGETS)
diff --git a/tools/configure b/tools/configure
index e2c3bd53f9..cc13e94268 100755
--- a/tools/configure
+++ b/tools/configure
@@ -190,13 +190,7 @@ if [ "-" = "$extra_defines" ]; then
      extra_defines="-DLOADABLE_FONTS"
      echo "*** Remember to copy the 'system.ajf' file to the root of your Archos!"
   else
-     echo "Proportional font support? (N)"
-     getit=`input`;
-     if [ "y" = "$getit" -o "Y" = "$getit"  ] ; then
-        extra_defines="-DLCD_PROPFONTS"
-     else
-        extra_defines=""
-     fi
+     extra_defines=""
   fi
  else
     extra_defines=""
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\