diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-09-02 12:40:19 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-09-02 12:40:19 +0000 |
| commit | 52a87c7ce76e31c0dcbb707a5bb4991b96a2cfb9 (patch) | |
| tree | e07653a669fd5ebf2aa26b012696ad50a88e7ac7 /tools | |
| parent | e800bca6dca50fd3c6616cfcc3102d6cbdbec05d (diff) | |
| download | rockbox-52a87c7ce76e31c0dcbb707a5bb4991b96a2cfb9.tar.gz rockbox-52a87c7ce76e31c0dcbb707a5bb4991b96a2cfb9.zip | |
removed the conflict markers
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2130 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/tools/configure b/tools/configure index c5f4876703..904af6c388 100755 --- a/tools/configure +++ b/tools/configure @@ -206,17 +206,6 @@ if [ -z "$target" ]; then esac fi -<<<<<<< configure -if [ "-DARCHOS_RECORDER" = "$target" ] ; then - - echo "Loadable fonts support? (y|n) [n]" - getit=`input`; - if [ "y" = "$getit" ] ; then - loadable_fonts="-DLOADABLE_FONTS" - fi -fi - -======= if [ "-" = "$extra_defines" ]; then extra_defines="" @@ -255,11 +244,7 @@ if [ "-" = "$extra_defines" ]; then fi fi -<<<<<<< configure ->>>>>>> 1.25 -======= ->>>>>>> 1.35 if [ -z "$debug" ]; then ################################################################## # Figure out debug on/off @@ -335,15 +320,7 @@ sed > Makefile \ -e "s,@APPSDIR@,${appsdir},g" \ -e "s,@DEBUG@,${debug},g" \ -e "s,@TARGET@,${target},g" \ -<<<<<<< configure -<<<<<<< configure - -e "s,@LOADABLE_FONTS@,${loadable_fonts},g" \ -======= - -e "s,@EXTRA_DEFINES@,${extra_defines},g" \ ->>>>>>> 1.25 -======= -e "s,@EXTRA_DEFINES@,\"${extra_defines}\",g" \ ->>>>>>> 1.35 -e "s,@PWD@,${pwd},g" \ <<EOF ## Automaticly generated. http://rockbox.haxx.se @@ -355,29 +332,16 @@ TARGET=@TARGET@ THISDIR="@PWD@" VERSION=\$(shell date +%y%m%d-%H%M) -<<<<<<< configure -EXTRA_CFLAGS=@LOADABLE_FONTS@ -======= EXTRA_DEFINES=@EXTRA_DEFINES@ ->>>>>>> 1.25 .PHONY: firmware apps all: firmware apps - for f in ../tools/*.ajf ; do cp \$\$f . ; done firmware: -<<<<<<< configure - make -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_CFLAGS=\$(EXTRA_CFLAGS) -======= \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES) ->>>>>>> 1.25 apps: -<<<<<<< configure - make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_CFLAGS=\$(EXTRA_CFLAGS) -======= \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES) ->>>>>>> 1.25 clean-firmware: \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean |