diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-11-26 14:10:21 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-11-26 14:10:21 +0000 |
commit | 7eda324c3bfd91af6172fab23c2c78b01c7903ee (patch) | |
tree | 78c3690911dd45da27634772525c9e2b36491c89 /tools | |
parent | cc9a8e12a1b2b7c03870b817700b7cb3c8c087fd (diff) | |
download | rockbox-7eda324c3bfd91af6172fab23c2c78b01c7903ee.tar.gz rockbox-7eda324c3bfd91af6172fab23c2c78b01c7903ee.zip |
Removed the prompting for demos and games. They're plugins now anyway.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4070 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/tools/configure b/tools/configure index 8302c557cf..8a527f7ec4 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -76,7 +76,6 @@ sed > Makefile \ | |||
76 | -e "s,@PWD@,${pwd},g" \ | 76 | -e "s,@PWD@,${pwd},g" \ |
77 | -e "s,@LANGUAGE@,${language},g" \ | 77 | -e "s,@LANGUAGE@,${language},g" \ |
78 | -e "s,@SIMVER@,${simver},g" \ | 78 | -e "s,@SIMVER@,${simver},g" \ |
79 | -e "s,@EXTRA_DEFINES@,${extra_defines},g" \ | ||
80 | <<EOF | 79 | <<EOF |
81 | ## Automaticly generated. http://rockbox.haxx.se | 80 | ## Automaticly generated. http://rockbox.haxx.se |
82 | 81 | ||
@@ -91,14 +90,13 @@ THISDIR="@PWD@" | |||
91 | SIMVER=@SIMVER@ | 90 | SIMVER=@SIMVER@ |
92 | LANGUAGE=@LANGUAGE@ | 91 | LANGUAGE=@LANGUAGE@ |
93 | VERSION=\$(shell date +%y%m%d-%H%M) | 92 | VERSION=\$(shell date +%y%m%d-%H%M) |
94 | EXTRA_DEFINES=@EXTRA_DEFINES@ | ||
95 | 93 | ||
96 | .PHONY: | 94 | .PHONY: |
97 | 95 | ||
98 | all: sim | 96 | all: sim |
99 | 97 | ||
100 | sim: | 98 | sim: |
101 | \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) LANGUAGE=\$(LANGUAGE) EXTRA_DEFINES="\$(EXTRA_DEFINES)" | 99 | \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) LANGUAGE=\$(LANGUAGE) |
102 | 100 | ||
103 | clean: | 101 | clean: |
104 | \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean | 102 | \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean |
@@ -202,7 +200,6 @@ if [ "$target" = "update" ]; then | |||
202 | debug=`grep "^DEBUG=" Makefile | cut -d= -f2-` | 200 | debug=`grep "^DEBUG=" Makefile | cut -d= -f2-` |
203 | language=`grep "^LANGUAGE=" Makefile | cut -d= -f2-` | 201 | language=`grep "^LANGUAGE=" Makefile | cut -d= -f2-` |
204 | memory=`grep "^MEMORYSIZE=" Makefile | cut -d= -f2-` | 202 | memory=`grep "^MEMORYSIZE=" Makefile | cut -d= -f2-` |
205 | extra_defines=`grep "^EXTRA_DEFINES=" Makefile | cut -d= -f2-` | ||
206 | 203 | ||
207 | if [ "$debug" = "SIMULATOR=1" ]; then | 204 | if [ "$debug" = "SIMULATOR=1" ]; then |
208 | simulator="yes" | 205 | simulator="yes" |
@@ -290,34 +287,6 @@ if [ -z "$memory" ]; then | |||
290 | echo "Memory size selected: $memory MB" | 287 | echo "Memory size selected: $memory MB" |
291 | fi | 288 | fi |
292 | 289 | ||
293 | if [ -z "$extra_defines" ]; then | ||
294 | if [ "player" != "$archos" ] ; then | ||
295 | disable_demos="-DDISABLE_NOTHING" | ||
296 | disable_games="" | ||
297 | |||
298 | echo "Do you want to use Demos? (Y)" | ||
299 | getit=`input`; | ||
300 | if [ "n" = "$getit" -o "N" = "$getit" ] ; then | ||
301 | disable_demos="-DDISABLE_DEMOS" | ||
302 | echo "Demos disabled" | ||
303 | else | ||
304 | echo "Demos enabled" | ||
305 | fi | ||
306 | |||
307 | echo "Do you want to play Games? (Y)" | ||
308 | getit=`input`; | ||
309 | if [ "n" = "$getit" -o "N" = "$getit" ] ; then | ||
310 | disable_games=" -DDISABLE_GAMES" | ||
311 | echo "Games disabled" | ||
312 | else | ||
313 | echo "Games enabled" | ||
314 | fi | ||
315 | |||
316 | extra_defines="$disable_demos$disable_games" | ||
317 | fi | ||
318 | fi | ||
319 | |||
320 | |||
321 | if [ -z "$debug" ]; then | 290 | if [ -z "$debug" ]; then |
322 | ################################################################## | 291 | ################################################################## |
323 | # Figure out debug on/off | 292 | # Figure out debug on/off |
@@ -450,7 +419,6 @@ sed > Makefile \ | |||
450 | -e "s,@TARGET@,${target},g" \ | 419 | -e "s,@TARGET@,${target},g" \ |
451 | -e "s,@ARCHOS@,${archos},g" \ | 420 | -e "s,@ARCHOS@,${archos},g" \ |
452 | -e "s,@LANGUAGE@,${language},g" \ | 421 | -e "s,@LANGUAGE@,${language},g" \ |
453 | -e "s,@EXTRA_DEFINES@,${extra_defines},g" \ | ||
454 | -e "s,@PWD@,${pwd},g" \ | 422 | -e "s,@PWD@,${pwd},g" \ |
455 | <<EOF | 423 | <<EOF |
456 | ## Automaticly generated. http://rockbox.haxx.se | 424 | ## Automaticly generated. http://rockbox.haxx.se |
@@ -466,16 +434,15 @@ LANGUAGE=@LANGUAGE@ | |||
466 | MEMORYSIZE=@MEMORY@ | 434 | MEMORYSIZE=@MEMORY@ |
467 | VERSION=\$(shell date +%y%m%d-%H%M) | 435 | VERSION=\$(shell date +%y%m%d-%H%M) |
468 | 436 | ||
469 | EXTRA_DEFINES=@EXTRA_DEFINES@ | ||
470 | .PHONY: firmware apps | 437 | .PHONY: firmware apps |
471 | 438 | ||
472 | all: firmware apps | 439 | all: firmware apps |
473 | 440 | ||
474 | firmware: | 441 | firmware: |
475 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES="\$(EXTRA_DEFINES)" MEM=\$(MEMORYSIZE) TOOLSDIR=\$(TOOLSDIR) | 442 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) MEM=\$(MEMORYSIZE) TOOLSDIR=\$(TOOLSDIR) |
476 | 443 | ||
477 | apps: | 444 | apps: |
478 | \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) LANGUAGE=\$(LANGUAGE) EXTRA_DEFINES="\$(EXTRA_DEFINES)" MEM=\$(MEMORYSIZE) TOOLSDIR=\$(TOOLSDIR) | 445 | \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) LANGUAGE=\$(LANGUAGE) MEM=\$(MEMORYSIZE) TOOLSDIR=\$(TOOLSDIR) |
479 | 446 | ||
480 | clean-firmware: | 447 | clean-firmware: |
481 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean | 448 | \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean |