Reverted back to monospace again. Let's not rock the boat until people can change it themselves (i.e. loadable fonts).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2032 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-08-28 11:54:41 +00:00
parent cfbdf142bc
commit 1f4e4d339c
5 changed files with 8 additions and 12 deletions

View file

@ -41,9 +41,6 @@ ifeq ($(TARGET),-DARCHOS_RECORDER)
SRC += $(wildcard recorder/*.c)
CFLAGS += -Irecorder
OUTNAME = ajbrec.ajz
ifneq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
CFLAGS += -DLCD_PROPFONTS
endif
else
OUTNAME = archos.mod
endif

View file

@ -41,10 +41,6 @@ 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)

8
tools/configure vendored
View file

@ -190,7 +190,15 @@ 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
fi
else
extra_defines=""

View file

@ -62,7 +62,6 @@ 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

View file

@ -75,10 +75,6 @@ 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\