diff options
-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 | |||
206 | esac | 206 | esac |
207 | fi | 207 | fi |
208 | 208 | ||
209 | <<<<<<< configure | ||
210 | if [ "-DARCHOS_RECORDER" = "$target" ] ; then | ||
211 | |||
212 | echo "Loadable fonts support? (y|n) [n]" | ||
213 | getit=`input`; | ||
214 | if [ "y" = "$getit" ] ; then | ||
215 | loadable_fonts="-DLOADABLE_FONTS" | ||
216 | fi | ||
217 | fi | ||
218 | |||
219 | ======= | ||
220 | if [ "-" = "$extra_defines" ]; then | 209 | if [ "-" = "$extra_defines" ]; then |
221 | extra_defines="" | 210 | extra_defines="" |
222 | 211 | ||
@@ -255,11 +244,7 @@ if [ "-" = "$extra_defines" ]; then | |||
255 | fi | 244 | fi |
256 | fi | 245 | fi |
257 | 246 | ||
258 | <<<<<<< configure | ||
259 | >>>>>>> 1.25 | ||
260 | ======= | ||
261 | 247 | ||
262 | >>>>>>> 1.35 | ||
263 | if [ -z "$debug" ]; then | 248 | if [ -z "$debug" ]; then |
264 | ################################################################## | 249 | ################################################################## |
265 | # Figure out debug on/off | 250 | # Figure out debug on/off |
@@ -335,15 +320,7 @@ sed > Makefile \ | |||
335 | -e "s,@APPSDIR@,${appsdir},g" \ | 320 | -e "s,@APPSDIR@,${appsdir},g" \ |
336 | -e "s,@DEBUG@,${debug},g" \ | 321 | -e "s,@DEBUG@,${debug},g" \ |
337 | -e "s,@TARGET@,${target},g" \ | 322 | -e "s,@TARGET@,${target},g" \ |
338 | <<<<<<< configure | ||
339 | <<<<<<< configure | ||
340 | -e "s,@LOADABLE_FONTS@,${loadable_fonts},g" \ | ||
341 | ======= | ||
342 | -e "s,@EXTRA_DEFINES@,${extra_defines},g" \ | ||
343 | >>>>>>> 1.25 | ||
344 | ======= | ||
345 | -e "s,@EXTRA_DEFINES@,\"${extra_defines}\",g" \ | 323 | -e "s,@EXTRA_DEFINES@,\"${extra_defines}\",g" \ |
346 | >>>>>>> 1.35 | ||
347 | -e "s,@PWD@,${pwd},g" \ | 324 | -e "s,@PWD@,${pwd},g" \ |
348 | <<EOF | 325 | <<EOF |
349 | ## Automaticly generated. http://rockbox.haxx.se | 326 | ## Automaticly generated. http://rockbox.haxx.se |
@@ -355,29 +332,16 @@ TARGET=@TARGET@ | |||
355 | THISDIR="@PWD@" | 332 | THISDIR="@PWD@" |
356 | VERSION=\$(shell date +%y%m%d-%H%M) | 333 | VERSION=\$(shell date +%y%m%d-%H%M) |
357 | 334 | ||
358 | <<<<<<< configure | ||
359 | EXTRA_CFLAGS=@LOADABLE_FONTS@ | ||
360 | ======= | ||
361 | EXTRA_DEFINES=@EXTRA_DEFINES@ | 335 | EXTRA_DEFINES=@EXTRA_DEFINES@ |
362 | >>>>>>> 1.25 | ||
363 | .PHONY: firmware apps | 336 | .PHONY: firmware apps |
364 | 337 | ||
365 | all: firmware apps | 338 | all: firmware apps |
366 | for f in ../tools/*.ajf ; do cp \$\$f . ; done | ||
367 | 339 | ||
368 | firmware: | 340 | firmware: |
369 | <<<<<<< configure | ||
370 | make -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_CFLAGS=\$(EXTRA_CFLAGS) | ||
371 | ======= | ||
372 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES) | 341 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES) |
373 | >>>>>>> 1.25 | ||
374 | 342 | ||
375 | apps: | 343 | apps: |
376 | <<<<<<< configure | ||
377 | make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_CFLAGS=\$(EXTRA_CFLAGS) | ||
378 | ======= | ||
379 | \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES) | 344 | \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES) |
380 | >>>>>>> 1.25 | ||
381 | 345 | ||
382 | clean-firmware: | 346 | clean-firmware: |
383 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean | 347 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean |