diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 20 | ||||
-rw-r--r-- | tools/root.make | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/tools/configure b/tools/configure index 459dd9c7a9..fc12c312c1 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -2061,13 +2061,13 @@ case $modelname in | |||
2061 | ;; | 2061 | ;; |
2062 | esac | 2062 | esac |
2063 | if [ "1" != `parse_args --type` ]; then | 2063 | if [ "1" != `parse_args --type` ]; then |
2064 | option=`parse_args --type`; | 2064 | btype=`parse_args --type`; |
2065 | else | 2065 | else |
2066 | echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, $gdbstub(M)anual: (Defaults to N)" | 2066 | echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, $gdbstub(M)anual: (Defaults to N)" |
2067 | option=`input`; | 2067 | btype=`input`; |
2068 | fi | 2068 | fi |
2069 | 2069 | ||
2070 | case $option in | 2070 | case $btype in |
2071 | [Ii]) | 2071 | [Ii]) |
2072 | appsdir='\$(ROOTDIR)/bootloader' | 2072 | appsdir='\$(ROOTDIR)/bootloader' |
2073 | apps="bootloader" | 2073 | apps="bootloader" |
@@ -2150,6 +2150,7 @@ fi | |||
2150 | exit 8 | 2150 | exit 8 |
2151 | fi | 2151 | fi |
2152 | debug="" | 2152 | debug="" |
2153 | btype="N" # set it explicitly since RET only gets here as well | ||
2153 | echo "Normal build selected" | 2154 | echo "Normal build selected" |
2154 | ;; | 2155 | ;; |
2155 | 2156 | ||
@@ -2388,6 +2389,16 @@ if test "$apps" = "apps"; then | |||
2388 | buildlangs="langs" | 2389 | buildlangs="langs" |
2389 | fi | 2390 | fi |
2390 | 2391 | ||
2392 | #### Fix the cmdline ### | ||
2393 | if test -n "$ccache"; then | ||
2394 | cmdline="--ccache" | ||
2395 | fi | ||
2396 | |||
2397 | cmdline="$cmdline --target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype" | ||
2398 | |||
2399 | |||
2400 | ### end of cmdline | ||
2401 | |||
2391 | sed > Makefile \ | 2402 | sed > Makefile \ |
2392 | -e "s,@ROOTDIR@,${rootdir},g" \ | 2403 | -e "s,@ROOTDIR@,${rootdir},g" \ |
2393 | -e "s,@DEBUG@,${debug},g" \ | 2404 | -e "s,@DEBUG@,${debug},g" \ |
@@ -2450,6 +2461,7 @@ sed > Makefile \ | |||
2450 | -e "s,@LANGS@,${buildlangs},g" \ | 2461 | -e "s,@LANGS@,${buildlangs},g" \ |
2451 | -e "s,@USE_ELF@,${USE_ELF},g" \ | 2462 | -e "s,@USE_ELF@,${USE_ELF},g" \ |
2452 | -e "s,@RBDIR@,${rbdir},g" \ | 2463 | -e "s,@RBDIR@,${rbdir},g" \ |
2464 | -e "s,@CMDLINE@,$cmdline,g" \ | ||
2453 | <<EOF | 2465 | <<EOF |
2454 | ## Automatically generated. http://www.rockbox.org/ | 2466 | ## Automatically generated. http://www.rockbox.org/ |
2455 | 2467 | ||
@@ -2514,6 +2526,8 @@ export ENCODER=@ENCODER@ | |||
2514 | export USE_ELF=@USE_ELF@ | 2526 | export USE_ELF=@USE_ELF@ |
2515 | export RBDIR=@RBDIR@ | 2527 | export RBDIR=@RBDIR@ |
2516 | 2528 | ||
2529 | CONFIGURE_OPTIONS=@CMDLINE@ | ||
2530 | |||
2517 | include \$(TOOLSDIR)/root.make | 2531 | include \$(TOOLSDIR)/root.make |
2518 | 2532 | ||
2519 | EOF | 2533 | EOF |
diff --git a/tools/root.make b/tools/root.make index 001d216d0f..5d2cea5567 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -291,6 +291,7 @@ help: | |||
291 | @echo "voicetools - builds the voice tools only" | 291 | @echo "voicetools - builds the voice tools only" |
292 | @echo "install - installs your build (for simulator builds only, no fonts)" | 292 | @echo "install - installs your build (for simulator builds only, no fonts)" |
293 | @echo "fullinstall - installs your build (for simulator builds only, with fonts)" | 293 | @echo "fullinstall - installs your build (for simulator builds only, with fonts)" |
294 | @echo "reconf - rerun configure with the same selection" | ||
294 | 295 | ||
295 | ### general compile rules: | 296 | ### general compile rules: |
296 | 297 | ||
@@ -311,3 +312,6 @@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.S | |||
311 | %.o: %.S | 312 | %.o: %.S |
312 | $(SILENT)mkdir -p $(dir $@) | 313 | $(SILENT)mkdir -p $(dir $@) |
313 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ | 314 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ |
315 | |||
316 | reconf: | ||
317 | $(SILENT)$(TOOLSDIR)/configure $(CONFIGURE_OPTIONS) | ||