mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
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:
parent
cfbdf142bc
commit
1f4e4d339c
5 changed files with 8 additions and 12 deletions
|
|
@ -41,9 +41,6 @@ ifeq ($(TARGET),-DARCHOS_RECORDER)
|
||||||
SRC += $(wildcard recorder/*.c)
|
SRC += $(wildcard recorder/*.c)
|
||||||
CFLAGS += -Irecorder
|
CFLAGS += -Irecorder
|
||||||
OUTNAME = ajbrec.ajz
|
OUTNAME = ajbrec.ajz
|
||||||
ifneq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
|
|
||||||
CFLAGS += -DLCD_PROPFONTS
|
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
OUTNAME = archos.mod
|
OUTNAME = archos.mod
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,6 @@ OUTPUT = $(OBJDIR)/librockbox.a
|
||||||
|
|
||||||
ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
|
ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
|
||||||
EXTRA_TARGETS = $(OBJDIR)/system.ajf
|
EXTRA_TARGETS = $(OBJDIR)/system.ajf
|
||||||
else
|
|
||||||
ifeq ($(TARGET),-DARCHOS_RECORDER)
|
|
||||||
CFLAGS += -DLCD_PROPFONTS
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all: $(OUTPUT) $(EXTRA_TARGETS)
|
all: $(OUTPUT) $(EXTRA_TARGETS)
|
||||||
|
|
|
||||||
8
tools/configure
vendored
8
tools/configure
vendored
|
|
@ -190,7 +190,15 @@ if [ "-" = "$extra_defines" ]; then
|
||||||
extra_defines="-DLOADABLE_FONTS"
|
extra_defines="-DLOADABLE_FONTS"
|
||||||
echo "*** Remember to copy the 'system.ajf' file to the root of your Archos!"
|
echo "*** Remember to copy the 'system.ajf' file to the root of your Archos!"
|
||||||
else
|
else
|
||||||
|
echo "Proportional font support? (N)"
|
||||||
|
|
||||||
|
getit=`input`;
|
||||||
|
|
||||||
|
if [ "y" = "$getit" -o "Y" = "$getit" ] ; then
|
||||||
|
extra_defines="-DLCD_PROPFONTS"
|
||||||
|
else
|
||||||
extra_defines=""
|
extra_defines=""
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
extra_defines=""
|
extra_defines=""
|
||||||
|
|
|
||||||
|
|
@ -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
|
MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c
|
||||||
|
|
||||||
ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
|
ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
|
||||||
DEFINES += -DLCD_PROPFONTS
|
|
||||||
APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \
|
APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \
|
||||||
widgets.c wormlet.c
|
widgets.c wormlet.c
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -75,10 +75,6 @@ ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES)))
|
||||||
FIRMSRCS += unicode.c ajf.c panic.c
|
FIRMSRCS += unicode.c ajf.c panic.c
|
||||||
EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf
|
EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf
|
||||||
SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf
|
SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf
|
||||||
else
|
|
||||||
ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
|
|
||||||
DEFINES += -DLCD_PROPFONTS
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
APPS = main.c tree.c menu.c credits.c main_menu.c\
|
APPS = main.c tree.c menu.c credits.c main_menu.c\
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue