summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-08-11 09:17:47 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-08-11 09:17:47 +0000
commitcd225736f95555c7083b642675d013bff8057d76 (patch)
treeb3e1bde3e0a22f11911401ea232e553341aee40c /tools
parent13fdf7e5a5df4cd2f34615c15fddd56f92e84d91 (diff)
downloadrockbox-cd225736f95555c7083b642675d013bff8057d76.tar.gz
rockbox-cd225736f95555c7083b642675d013bff8057d76.zip
First version of loadable fonts patch by Alex Gitelman
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1666 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile8
-rwxr-xr-xtools/configure38
2 files changed, 38 insertions, 8 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 92f621f51e..9d47a1c762 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,7 +8,7 @@
#
CFLAGS := -O -s -ansi
-TARGETS := scramble descramble sh2d
+TARGETS := scramble descramble sh2d bdf2ajf
all: $(TARGETS)
@@ -18,5 +18,9 @@ descramble: descramble.c
sh2d: sh2d.c
+bdf2ajf: bdf2ajf.c
+ gcc -O -ansi $+ -o $@
+
clean:
- rm -f $(TARGETS) *~
+ rm -f $(TARGETS) $(shell for f in $(TARGETS) ; do echo $$f.exe $$f.o $$f.obj ; done) *.ajf *~
+
diff --git a/tools/configure b/tools/configure
index 2ddfb72360..bf89d88929 100755
--- a/tools/configure
+++ b/tools/configure
@@ -11,6 +11,8 @@
target=$1
debug=$2
+extra_defines="-"
+
input() {
read response
echo $response
@@ -66,8 +68,9 @@ sed > Makefile \
-e "s,@KEYPAD@,${keypad},g" \
-e "s,@PWD@,${pwd},g" \
-e "s,@SIMVER@,${simver},g" \
+ -e "s,@EXTRA_DEFINES@,${extra_defines},g" \
<<EOF
-## Automaticly generated. http://bjorn.haxx.se/rockbox/
+## Automaticly generated. http://rockbox.haxx.se
SIMDIR=@SIMDIR@
DEBUG=@DEBUG@
@@ -77,13 +80,14 @@ KEYPAD=@KEYPAD@
THISDIR="@PWD@"
SIMVER=@SIMVER@
VERSION=\$(shell date +%y%m%d-%H%M)
+EXTRA_DEFINES=@EXTRA_DEFINES@
.PHONY:
all: sim
sim:
- \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION)
+ \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES)
clean-sim:
\$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean
@@ -121,6 +125,7 @@ if [ "$target" = "update" ]; then
echo "Existing generated Makefile found. Getting defaults from it."
target=`grep "^TARGET=" Makefile | cut -d= -f2-`
debug=`grep "^DEBUG=" Makefile | cut -d= -f2-`
+ extra_defines=`grep "^EXTRA_DEFINES=" Makefile | cut -d= -f2-`
if [ "$debug" = "SIMULATOR=1" ]; then
simulator="yes"
@@ -133,7 +138,7 @@ if [ "$target" = "update" ]; then
else
echo "Setup your Rockbox build environment."
-echo "http://bjorn.haxx.se/rockbox/"
+echo "http://rockbox.haxx.se/"
echo ""
fi
@@ -175,6 +180,25 @@ if [ -z "$target" ]; then
esac
fi
+if [ "-" == "$extra_defines" ]; then
+ if [ "-DARCHOS_RECORDER" = "$target" ] ; then
+
+ echo "Loadable fonts support? (N)"
+ getit=`input`;
+ if [ "y" = "$getit" ] ; then
+ extra_defines="-DLOADABLE_FONTS"
+ else
+ echo "Proportional font support? (N)"
+ getit=`input`;
+ if [ "y" = "$getit" ] ; then
+ extra_defines="-DLCD_PROPFONTS"
+ else
+ extra_defines=""
+ fi
+ fi
+ fi
+fi
+
if [ -z "$debug" ]; then
##################################################################
# Figure out debug on/off
@@ -250,9 +274,10 @@ sed > Makefile \
-e "s,@APPSDIR@,${appsdir},g" \
-e "s,@DEBUG@,${debug},g" \
-e "s,@TARGET@,${target},g" \
+ -e "s,@EXTRA_DEFINES@,${extra_defines},g" \
-e "s,@PWD@,${pwd},g" \
<<EOF
-## Automaticly generated. http://bjorn.haxx.se/rockbox/
+## Automaticly generated. http://rockbox.haxx.se
FIRMDIR=@FIRMDIR@
APPSDIR=@APPSDIR@
@@ -261,15 +286,16 @@ TARGET=@TARGET@
THISDIR="@PWD@"
VERSION=\$(shell date +%y%m%d-%H%M)
+EXTRA_DEFINES=@EXTRA_DEFINES@
.PHONY: firmware apps
all: firmware apps
firmware:
- \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR)
+ \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES)
apps:
- \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION)
+ \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES)
clean-firmware:
\$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean