len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made LCD_PROPFONTS default on recorder

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2016 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-08-27 22:49:13 +00:00
parent 3478d9b8e4
commit af406a1f6d
5 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/Makefile
View file

@ -17,11 +17,6 @@ FIRMWARE := ../firmware
INCLUDES= -I$(FIRMWARE)/include -I$(FIRMWARE) -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I$(FIRMWARE)/malloc -I. 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: # store output files in this directory:
OBJDIR = . OBJDIR = .

10
firmware/Makefile
View file

@ -17,11 +17,6 @@ INCLUDES=-Iinclude -I. -Icommon -Idrivers
SYSTEM_FONT = fonts/alt6x10.bdf 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: # store output files in this directory:
OBJDIR = . OBJDIR = .
@ -43,8 +38,13 @@ DIRS = $(subst $(DEPS),".",$(DEPDIRS))
OUTPUT = $(OBJDIR)/librockbox.a 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
View file

@ -190,13 +190,7 @@ 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)" extra_defines=""
getit=`input`;
if [ "y" = "$getit" -o "Y" = "$getit" ] ; then
extra_defines="-DLCD_PROPFONTS"
else
extra_defines=""
fi
fi fi
else else
extra_defines="" extra_defines=""

7
uisimulator/win32/Makefile
View file

@ -36,12 +36,6 @@ OBJDIR = .
TARGET = $(OBJDIR)/uisw32.exe 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 \ DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
$(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(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 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

10
uisimulator/x11/Makefile
View file

@ -36,12 +36,6 @@ OBJDIR = .
TARGET = $(OBJDIR)/rockboxui 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 \ DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
$(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES)
@ -81,6 +75,10 @@ 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\