diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-08-28 11:54:41 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-08-28 11:54:41 +0000 |
| commit | 1f4e4d339c557477c0291f2e0596111fc65b7409 (patch) | |
| tree | bc43951539103a0a8b12f0ead0b8252bcaddfbfe | |
| parent | cfbdf142bc7a9696b4992fa04497b8bf2cdab3f6 (diff) | |
| download | rockbox-1f4e4d339c557477c0291f2e0596111fc65b7409.zip rockbox-1f4e4d339c557477c0291f2e0596111fc65b7409.tar.gz rockbox-1f4e4d339c557477c0291f2e0596111fc65b7409.tar.bz2 rockbox-1f4e4d339c557477c0291f2e0596111fc65b7409.tar.xz | |
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
| -rw-r--r-- | apps/Makefile | 3 | ||||
| -rw-r--r-- | firmware/Makefile | 4 | ||||
| -rwxr-xr-x | tools/configure | 8 | ||||
| -rw-r--r-- | uisimulator/win32/Makefile | 1 | ||||
| -rw-r--r-- | uisimulator/x11/Makefile | 4 |
5 files changed, 8 insertions, 12 deletions
diff --git a/apps/Makefile b/apps/Makefile index 5913faf..07b093e 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -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 diff --git a/firmware/Makefile b/firmware/Makefile index 252b1ea..24f5b46 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -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) diff --git a/tools/configure b/tools/configure index cc13e94..d57723e 100755 --- a/tools/configure +++ b/tools/configure @@ -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="" diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index a45a4a6..92fdf21 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile @@ -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 diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index f5856aa..6b778f4 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -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\ |