diff options
author | Daniel Stenberg <daniel@haxx.se> | 2008-01-23 10:59:17 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2008-01-23 10:59:17 +0000 |
commit | 9759c035f40e67015762effc9a0a0a29b45e3bf2 (patch) | |
tree | dcb85a58167b734b28bf88bb1b3496a848770e3c | |
parent | ebe5acfb9dd80bfce2c915a568e2c86244b67510 (diff) | |
download | rockbox-9759c035f40e67015762effc9a0a0a29b45e3bf2.tar.gz rockbox-9759c035f40e67015762effc9a0a0a29b45e3bf2.zip |
Renamed 'archos' to 'modelname' in the configure script and the Makefiles
using it, to reduce confusion for newcomers who never even had an Archos. Those
innocent youngsters.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16149 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/Makefile | 7 | ||||
-rw-r--r-- | gdb/Makefile | 2 | ||||
-rwxr-xr-x | tools/configure | 194 | ||||
-rw-r--r-- | uisimulator/sdl/Makefile | 8 |
4 files changed, 79 insertions, 132 deletions
diff --git a/apps/Makefile b/apps/Makefile index 649dd48496..eee9c034dd 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -62,7 +62,7 @@ endif | |||
62 | 62 | ||
63 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(DEFINES) -DTARGET_ID=$(TARGET_ID) \ | 63 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(DEFINES) -DTARGET_ID=$(TARGET_ID) \ |
64 | -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} \ | 64 | -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} \ |
65 | -DTARGET_NAME=\"$(ARCHOS)\" | 65 | -DTARGET_NAME=\"$(MODELNAME)\" |
66 | 66 | ||
67 | OBJS2 := $(OBJDIR)/lang.o $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) | 67 | OBJS2 := $(OBJDIR)/lang.o $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) |
68 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | 68 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) |
@@ -218,11 +218,12 @@ $(OBJDIR)/features: features.txt | |||
218 | $(SILENT)cat $< | $(HOSTCC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ | 218 | $(SILENT)cat $< | $(HOSTCC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ |
219 | $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \ | 219 | $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \ |
220 | grep -v "^\#" | grep -v "^$$" > $@; \ | 220 | grep -v "^\#" | grep -v "^$$" > $@; \ |
221 | echo "" >/dev/null | 221 | for f in `cat $(OBJDIR)/features`; do feat="$$feat:$$f" ; done ; \ |
222 | echo "$$feat" >$(OBJDIR)/genlang-features | ||
222 | 223 | ||
223 | $(OBJDIR)/lang.o: lang/$(LANGUAGE).lang $(OBJDIR)/features | 224 | $(OBJDIR)/lang.o: lang/$(LANGUAGE).lang $(OBJDIR)/features |
224 | $(SILENT)for f in `cat $(OBJDIR)/features`; do feat="$$feat:$$f" ; done; \ | 225 | $(SILENT)for f in `cat $(OBJDIR)/features`; do feat="$$feat:$$f" ; done; \ |
225 | perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(ARCHOS)$$feat $< | 226 | perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $< |
226 | $(call PRINTS,CC lang.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@ | 227 | $(call PRINTS,CC lang.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@ |
227 | 228 | ||
228 | clean: | 229 | clean: |
diff --git a/gdb/Makefile b/gdb/Makefile index 0850767f58..83181999f3 100644 --- a/gdb/Makefile +++ b/gdb/Makefile | |||
@@ -7,7 +7,7 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | ifeq ($(ARCHOS),ifp7xx) | 10 | ifeq ($(MODELNAME),ifp7xx) |
11 | 11 | ||
12 | INCLUDES= -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(OBJDIR) \ | 12 | INCLUDES= -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(OBJDIR) \ |
13 | -I$(BUILDDIR) | 13 | -I$(BUILDDIR) |
diff --git a/tools/configure b/tools/configure index 2ece6cd3ff..f0004fd2ba 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -236,7 +236,7 @@ whichadvanced () { | |||
236 | if [ "$memory" = "2" ]; then | 236 | if [ "$memory" = "2" ]; then |
237 | echo -n ", (8)MB MOD" | 237 | echo -n ", (8)MB MOD" |
238 | fi | 238 | fi |
239 | if [ "$archos" = "h120" ]; then | 239 | if [ "$modelname" = "h120" ]; then |
240 | echo -n ", (R)TC MOD" | 240 | echo -n ", (R)TC MOD" |
241 | fi | 241 | fi |
242 | echo "" | 242 | echo "" |
@@ -285,7 +285,7 @@ whichadvanced () { | |||
285 | fi | 285 | fi |
286 | ;; | 286 | ;; |
287 | [Rr]) | 287 | [Rr]) |
288 | if [ "$archos" = "h120" ]; then | 288 | if [ "$modelname" = "h120" ]; then |
289 | config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" | 289 | config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" |
290 | have_rtc_alarm="#define HAVE_RTC_ALARM" | 290 | have_rtc_alarm="#define HAVE_RTC_ALARM" |
291 | echo "RTC functions enabled (DS1339/DS3231)" | 291 | echo "RTC functions enabled (DS1339/DS3231)" |
@@ -340,7 +340,7 @@ whichadvanced () { | |||
340 | # Configure voice settings | 340 | # Configure voice settings |
341 | voiceconfig () { | 341 | voiceconfig () { |
342 | thislang=$1 | 342 | thislang=$1 |
343 | echo "Building $thislang voice for $archos. Select options" | 343 | echo "Building $thislang voice for $modelname. Select options" |
344 | echo "" | 344 | echo "" |
345 | 345 | ||
346 | if [ -f "`which flite`" ]; then | 346 | if [ -f "`which flite`" ]; then |
@@ -626,10 +626,10 @@ EOF | |||
626 | # ---- For each target ---- | 626 | # ---- For each target ---- |
627 | # | 627 | # |
628 | # *Variables* | 628 | # *Variables* |
629 | # target_id: a unique number identifying this target, DOES NOT necessarily | 629 | # target_id: a unique number identifying this target, IS NOT the menu number. |
630 | # have to be the menu number. Just use the currently highest | 630 | # Just use the currently highest number+1 when you add a new |
631 | # number+1 when you add a new target. | 631 | # target. |
632 | # archos: short model name used all over to identify this target | 632 | # modelname: short model name used all over to identify this target |
633 | # memory: number of megabytes of RAM this target has. If the amount can | 633 | # memory: number of megabytes of RAM this target has. If the amount can |
634 | # be selected by the size prompt, let memory be unset here | 634 | # be selected by the size prompt, let memory be unset here |
635 | # target: -Ddefine passed to the build commands to make the correct | 635 | # target: -Ddefine passed to the build commands to make the correct |
@@ -644,8 +644,9 @@ EOF | |||
644 | # appextra: passed to the APPEXTRA variable in the Makefiles. | 644 | # appextra: passed to the APPEXTRA variable in the Makefiles. |
645 | # TODO: add proper explanation | 645 | # TODO: add proper explanation |
646 | # archosrom: used only for Archos targets that build a special flashable .ucl | 646 | # archosrom: used only for Archos targets that build a special flashable .ucl |
647 | # image. Set to blank for other builds. | 647 | # image. |
648 | # flash: the same as archosrom. These two should be merged | 648 | # flash: name of output for flashing, for targets where there's a special |
649 | # file output for this. | ||
649 | # plugins: set to 'yes' to build the plugins. Early development builds can | 650 | # plugins: set to 'yes' to build the plugins. Early development builds can |
650 | # set this to no in the early stages to have an easier life for a | 651 | # set this to no in the early stages to have an easier life for a |
651 | # while | 652 | # while |
@@ -662,7 +663,7 @@ EOF | |||
662 | 663 | ||
663 | 0|player) | 664 | 0|player) |
664 | target_id=1 | 665 | target_id=1 |
665 | archos="player" | 666 | modelname="player" |
666 | target="-DARCHOS_PLAYER" | 667 | target="-DARCHOS_PLAYER" |
667 | shcc | 668 | shcc |
668 | tool="$rootdir/tools/scramble" | 669 | tool="$rootdir/tools/scramble" |
@@ -688,7 +689,7 @@ EOF | |||
688 | 689 | ||
689 | 1|recorder) | 690 | 1|recorder) |
690 | target_id=2 | 691 | target_id=2 |
691 | archos="recorder" | 692 | modelname="recorder" |
692 | target="-DARCHOS_RECORDER" | 693 | target="-DARCHOS_RECORDER" |
693 | shcc | 694 | shcc |
694 | tool="$rootdir/tools/scramble" | 695 | tool="$rootdir/tools/scramble" |
@@ -696,7 +697,7 @@ EOF | |||
696 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" | 697 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" |
697 | output="ajbrec.ajz" | 698 | output="ajbrec.ajz" |
698 | appextra="recorder:gui" | 699 | appextra="recorder:gui" |
699 | archosrom="" #"$pwd/rombox.ucl" | 700 | #archosrom="$pwd/rombox.ucl" |
700 | flash="$pwd/rockbox.ucl" | 701 | flash="$pwd/rockbox.ucl" |
701 | plugins="yes" | 702 | plugins="yes" |
702 | swcodec="" | 703 | swcodec="" |
@@ -710,7 +711,7 @@ EOF | |||
710 | 711 | ||
711 | 2|fmrecorder) | 712 | 2|fmrecorder) |
712 | target_id=3 | 713 | target_id=3 |
713 | archos="fmrecorder" | 714 | modelname="fmrecorder" |
714 | target="-DARCHOS_FMRECORDER" | 715 | target="-DARCHOS_FMRECORDER" |
715 | shcc | 716 | shcc |
716 | tool="$rootdir/tools/scramble -fm" | 717 | tool="$rootdir/tools/scramble -fm" |
@@ -718,7 +719,7 @@ EOF | |||
718 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" | 719 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" |
719 | output="ajbrec.ajz" | 720 | output="ajbrec.ajz" |
720 | appextra="recorder:gui" | 721 | appextra="recorder:gui" |
721 | archosrom="" #"$pwd/rombox.ucl" | 722 | #archosrom="$pwd/rombox.ucl" |
722 | flash="$pwd/rockbox.ucl" | 723 | flash="$pwd/rockbox.ucl" |
723 | plugins="yes" | 724 | plugins="yes" |
724 | swcodec="" | 725 | swcodec="" |
@@ -732,7 +733,7 @@ EOF | |||
732 | 733 | ||
733 | 3|recorderv2) | 734 | 3|recorderv2) |
734 | target_id=4 | 735 | target_id=4 |
735 | archos="recorderv2" | 736 | modelname="recorderv2" |
736 | target="-DARCHOS_RECORDERV2" | 737 | target="-DARCHOS_RECORDERV2" |
737 | shcc | 738 | shcc |
738 | tool="$rootdir/tools/scramble -v2" | 739 | tool="$rootdir/tools/scramble -v2" |
@@ -740,7 +741,7 @@ EOF | |||
740 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" | 741 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" |
741 | output="ajbrec.ajz" | 742 | output="ajbrec.ajz" |
742 | appextra="recorder:gui" | 743 | appextra="recorder:gui" |
743 | archosrom="" #"$pwd/rombox.ucl" | 744 | #archosrom="$pwd/rombox.ucl" |
744 | flash="$pwd/rockbox.ucl" | 745 | flash="$pwd/rockbox.ucl" |
745 | plugins="yes" | 746 | plugins="yes" |
746 | swcodec="" | 747 | swcodec="" |
@@ -754,7 +755,7 @@ EOF | |||
754 | 755 | ||
755 | 4|ondiosp) | 756 | 4|ondiosp) |
756 | target_id=7 | 757 | target_id=7 |
757 | archos="ondiosp" | 758 | modelname="ondiosp" |
758 | target="-DARCHOS_ONDIOSP" | 759 | target="-DARCHOS_ONDIOSP" |
759 | shcc | 760 | shcc |
760 | tool="$rootdir/tools/scramble -osp" | 761 | tool="$rootdir/tools/scramble -osp" |
@@ -776,7 +777,7 @@ EOF | |||
776 | 777 | ||
777 | 5|ondiofm) | 778 | 5|ondiofm) |
778 | target_id=8 | 779 | target_id=8 |
779 | archos="ondiofm" | 780 | modelname="ondiofm" |
780 | target="-DARCHOS_ONDIOFM" | 781 | target="-DARCHOS_ONDIOFM" |
781 | shcc | 782 | shcc |
782 | tool="$rootdir/tools/scramble -ofm" | 783 | tool="$rootdir/tools/scramble -ofm" |
@@ -784,7 +785,7 @@ EOF | |||
784 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" | 785 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" |
785 | output="ajbrec.ajz" | 786 | output="ajbrec.ajz" |
786 | appextra="recorder:gui" | 787 | appextra="recorder:gui" |
787 | archosrom="" #"$pwd/rombox.ucl" | 788 | #archosrom="$pwd/rombox.ucl" |
788 | flash="$pwd/rockbox.ucl" | 789 | flash="$pwd/rockbox.ucl" |
789 | plugins="yes" | 790 | plugins="yes" |
790 | swcodec="" | 791 | swcodec="" |
@@ -796,7 +797,7 @@ EOF | |||
796 | 797 | ||
797 | 6|av300) | 798 | 6|av300) |
798 | target_id=26 | 799 | target_id=26 |
799 | archos="av300" | 800 | modelname="av300" |
800 | target="-DARCHOS_AV300" | 801 | target="-DARCHOS_AV300" |
801 | memory=16 # always | 802 | memory=16 # always |
802 | arm7tdmicc | 803 | arm7tdmicc |
@@ -805,8 +806,6 @@ EOF | |||
805 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" | 806 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" |
806 | output="cjbm.ajz" | 807 | output="cjbm.ajz" |
807 | appextra="recorder:gui" | 808 | appextra="recorder:gui" |
808 | archosrom="" | ||
809 | flash="" | ||
810 | plugins="yes" | 809 | plugins="yes" |
811 | swcodec="" | 810 | swcodec="" |
812 | # toolset is the tools within the tools directory that we build for | 811 | # toolset is the tools within the tools directory that we build for |
@@ -820,7 +819,7 @@ EOF | |||
820 | 819 | ||
821 | 10|h120) | 820 | 10|h120) |
822 | target_id=9 | 821 | target_id=9 |
823 | archos="h120" | 822 | modelname="h120" |
824 | target="-DIRIVER_H120" | 823 | target="-DIRIVER_H120" |
825 | memory=32 # always | 824 | memory=32 # always |
826 | coldfirecc | 825 | coldfirecc |
@@ -831,7 +830,6 @@ EOF | |||
831 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" | 830 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" |
832 | output="rockbox.iriver" | 831 | output="rockbox.iriver" |
833 | appextra="recorder:gui" | 832 | appextra="recorder:gui" |
834 | archosrom="" | ||
835 | flash="$pwd/rombox.iriver" | 833 | flash="$pwd/rombox.iriver" |
836 | plugins="yes" | 834 | plugins="yes" |
837 | swcodec="yes" | 835 | swcodec="yes" |
@@ -845,7 +843,7 @@ EOF | |||
845 | 843 | ||
846 | 11|h300) | 844 | 11|h300) |
847 | target_id=10 | 845 | target_id=10 |
848 | archos="h300" | 846 | modelname="h300" |
849 | target="-DIRIVER_H300" | 847 | target="-DIRIVER_H300" |
850 | memory=32 # always | 848 | memory=32 # always |
851 | coldfirecc | 849 | coldfirecc |
@@ -856,8 +854,6 @@ EOF | |||
856 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" | 854 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" |
857 | output="rockbox.iriver" | 855 | output="rockbox.iriver" |
858 | appextra="recorder:gui" | 856 | appextra="recorder:gui" |
859 | archosrom="" | ||
860 | flash="" | ||
861 | plugins="yes" | 857 | plugins="yes" |
862 | swcodec="yes" | 858 | swcodec="yes" |
863 | # toolset is the tools within the tools directory that we build for | 859 | # toolset is the tools within the tools directory that we build for |
@@ -870,7 +866,7 @@ EOF | |||
870 | 866 | ||
871 | 12|h100) | 867 | 12|h100) |
872 | target_id=11 | 868 | target_id=11 |
873 | archos="h100" | 869 | modelname="h100" |
874 | target="-DIRIVER_H100" | 870 | target="-DIRIVER_H100" |
875 | memory=16 # always | 871 | memory=16 # always |
876 | coldfirecc | 872 | coldfirecc |
@@ -881,8 +877,6 @@ EOF | |||
881 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" | 877 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" |
882 | output="rockbox.iriver" | 878 | output="rockbox.iriver" |
883 | appextra="recorder:gui" | 879 | appextra="recorder:gui" |
884 | archosrom="" | ||
885 | flash="" | ||
886 | plugins="yes" | 880 | plugins="yes" |
887 | swcodec="yes" | 881 | swcodec="yes" |
888 | # toolset is the tools within the tools directory that we build for | 882 | # toolset is the tools within the tools directory that we build for |
@@ -895,7 +889,7 @@ EOF | |||
895 | 889 | ||
896 | 13|ifp7xx) | 890 | 13|ifp7xx) |
897 | target_id=19 | 891 | target_id=19 |
898 | archos="ifp7xx" | 892 | modelname="ifp7xx" |
899 | target="-DIRIVER_IFP7XX" | 893 | target="-DIRIVER_IFP7XX" |
900 | memory=1 | 894 | memory=1 |
901 | arm7tdmicc short | 895 | arm7tdmicc short |
@@ -904,8 +898,6 @@ EOF | |||
904 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" | 898 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" |
905 | output="rockbox.wma" | 899 | output="rockbox.wma" |
906 | appextra="recorder:gui" | 900 | appextra="recorder:gui" |
907 | archosrom="" | ||
908 | flash="" | ||
909 | plugins="yes" | 901 | plugins="yes" |
910 | swcodec="yes" | 902 | swcodec="yes" |
911 | # toolset is the tools within the tools directory that we build for | 903 | # toolset is the tools within the tools directory that we build for |
@@ -918,7 +910,7 @@ EOF | |||
918 | 910 | ||
919 | 14|h10) | 911 | 14|h10) |
920 | target_id=22 | 912 | target_id=22 |
921 | archos="h10" | 913 | modelname="h10" |
922 | target="-DIRIVER_H10" | 914 | target="-DIRIVER_H10" |
923 | memory=32 # always | 915 | memory=32 # always |
924 | arm7tdmicc | 916 | arm7tdmicc |
@@ -927,8 +919,6 @@ EOF | |||
927 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" | 919 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" |
928 | output="rockbox.mi4" | 920 | output="rockbox.mi4" |
929 | appextra="recorder:gui" | 921 | appextra="recorder:gui" |
930 | archosrom="" | ||
931 | flash="" | ||
932 | plugins="yes" | 922 | plugins="yes" |
933 | swcodec="yes" | 923 | swcodec="yes" |
934 | boottool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBBL" | 924 | boottool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBBL" |
@@ -944,7 +934,7 @@ EOF | |||
944 | 934 | ||
945 | 15|h10_5gb) | 935 | 15|h10_5gb) |
946 | target_id=24 | 936 | target_id=24 |
947 | archos="h10_5gb" | 937 | modelname="h10_5gb" |
948 | target="-DIRIVER_H10_5GB" | 938 | target="-DIRIVER_H10_5GB" |
949 | memory=32 # always | 939 | memory=32 # always |
950 | arm7tdmicc | 940 | arm7tdmicc |
@@ -953,8 +943,6 @@ EOF | |||
953 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" | 943 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" |
954 | output="rockbox.mi4" | 944 | output="rockbox.mi4" |
955 | appextra="recorder:gui" | 945 | appextra="recorder:gui" |
956 | archosrom="" | ||
957 | flash="" | ||
958 | plugins="yes" | 946 | plugins="yes" |
959 | swcodec="yes" | 947 | swcodec="yes" |
960 | boottool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBBL" | 948 | boottool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBBL" |
@@ -970,7 +958,7 @@ EOF | |||
970 | 958 | ||
971 | 20|ipodcolor) | 959 | 20|ipodcolor) |
972 | target_id=13 | 960 | target_id=13 |
973 | archos="ipodcolor" | 961 | modelname="ipodcolor" |
974 | target="-DIPOD_COLOR" | 962 | target="-DIPOD_COLOR" |
975 | memory=32 # always | 963 | memory=32 # always |
976 | arm7tdmicc | 964 | arm7tdmicc |
@@ -979,11 +967,9 @@ EOF | |||
979 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" | 967 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" |
980 | output="rockbox.ipod" | 968 | output="rockbox.ipod" |
981 | appextra="recorder:gui" | 969 | appextra="recorder:gui" |
982 | archosrom="" | ||
983 | flash="" | ||
984 | plugins="yes" | 970 | plugins="yes" |
985 | swcodec="yes" | 971 | swcodec="yes" |
986 | bootoutput="bootloader-$archos.ipod" | 972 | bootoutput="bootloader-$modelname.ipod" |
987 | # toolset is the tools within the tools directory that we build for | 973 | # toolset is the tools within the tools directory that we build for |
988 | # this particular target. | 974 | # this particular target. |
989 | toolset=$ipodbitmaptools | 975 | toolset=$ipodbitmaptools |
@@ -995,7 +981,7 @@ EOF | |||
995 | 981 | ||
996 | 21|ipodnano) | 982 | 21|ipodnano) |
997 | target_id=14 | 983 | target_id=14 |
998 | archos="ipodnano" | 984 | modelname="ipodnano" |
999 | target="-DIPOD_NANO" | 985 | target="-DIPOD_NANO" |
1000 | memory=32 # always | 986 | memory=32 # always |
1001 | arm7tdmicc | 987 | arm7tdmicc |
@@ -1004,11 +990,9 @@ EOF | |||
1004 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" | 990 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" |
1005 | output="rockbox.ipod" | 991 | output="rockbox.ipod" |
1006 | appextra="recorder:gui" | 992 | appextra="recorder:gui" |
1007 | archosrom="" | ||
1008 | flash="" | ||
1009 | plugins="yes" | 993 | plugins="yes" |
1010 | swcodec="yes" | 994 | swcodec="yes" |
1011 | bootoutput="bootloader-$archos.ipod" | 995 | bootoutput="bootloader-$modelname.ipod" |
1012 | # toolset is the tools within the tools directory that we build for | 996 | # toolset is the tools within the tools directory that we build for |
1013 | # this particular target. | 997 | # this particular target. |
1014 | toolset=$ipodbitmaptools | 998 | toolset=$ipodbitmaptools |
@@ -1020,7 +1004,7 @@ EOF | |||
1020 | 1004 | ||
1021 | 22|ipodvideo) | 1005 | 22|ipodvideo) |
1022 | target_id=15 | 1006 | target_id=15 |
1023 | archos="ipodvideo" | 1007 | modelname="ipodvideo" |
1024 | target="-DIPOD_VIDEO" | 1008 | target="-DIPOD_VIDEO" |
1025 | arm7tdmicc | 1009 | arm7tdmicc |
1026 | tool="$rootdir/tools/scramble -add=ipvd" | 1010 | tool="$rootdir/tools/scramble -add=ipvd" |
@@ -1028,11 +1012,9 @@ EOF | |||
1028 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1012 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
1029 | output="rockbox.ipod" | 1013 | output="rockbox.ipod" |
1030 | appextra="recorder:gui" | 1014 | appextra="recorder:gui" |
1031 | archosrom="" | ||
1032 | flash="" | ||
1033 | plugins="yes" | 1015 | plugins="yes" |
1034 | swcodec="yes" | 1016 | swcodec="yes" |
1035 | bootoutput="bootloader-$archos.ipod" | 1017 | bootoutput="bootloader-$modelname.ipod" |
1036 | # toolset is the tools within the tools directory that we build for | 1018 | # toolset is the tools within the tools directory that we build for |
1037 | # this particular target. | 1019 | # this particular target. |
1038 | toolset=$ipodbitmaptools | 1020 | toolset=$ipodbitmaptools |
@@ -1044,7 +1026,7 @@ EOF | |||
1044 | 1026 | ||
1045 | 23|ipod3g) | 1027 | 23|ipod3g) |
1046 | target_id=16 | 1028 | target_id=16 |
1047 | archos="ipod3g" | 1029 | modelname="ipod3g" |
1048 | target="-DIPOD_3G" | 1030 | target="-DIPOD_3G" |
1049 | memory=32 # always | 1031 | memory=32 # always |
1050 | arm7tdmicc | 1032 | arm7tdmicc |
@@ -1053,11 +1035,9 @@ EOF | |||
1053 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" | 1035 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" |
1054 | output="rockbox.ipod" | 1036 | output="rockbox.ipod" |
1055 | appextra="recorder:gui" | 1037 | appextra="recorder:gui" |
1056 | archosrom="" | ||
1057 | flash="" | ||
1058 | plugins="yes" | 1038 | plugins="yes" |
1059 | swcodec="yes" | 1039 | swcodec="yes" |
1060 | bootoutput="bootloader-$archos.ipod" | 1040 | bootoutput="bootloader-$modelname.ipod" |
1061 | # toolset is the tools within the tools directory that we build for | 1041 | # toolset is the tools within the tools directory that we build for |
1062 | # this particular target. | 1042 | # this particular target. |
1063 | toolset=$ipodbitmaptools | 1043 | toolset=$ipodbitmaptools |
@@ -1069,7 +1049,7 @@ EOF | |||
1069 | 1049 | ||
1070 | 24|ipod4g) | 1050 | 24|ipod4g) |
1071 | target_id=17 | 1051 | target_id=17 |
1072 | archos="ipod4g" | 1052 | modelname="ipod4g" |
1073 | target="-DIPOD_4G" | 1053 | target="-DIPOD_4G" |
1074 | memory=32 # always | 1054 | memory=32 # always |
1075 | arm7tdmicc | 1055 | arm7tdmicc |
@@ -1078,11 +1058,9 @@ EOF | |||
1078 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" | 1058 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" |
1079 | output="rockbox.ipod" | 1059 | output="rockbox.ipod" |
1080 | appextra="recorder:gui" | 1060 | appextra="recorder:gui" |
1081 | archosrom="" | ||
1082 | flash="" | ||
1083 | plugins="yes" | 1061 | plugins="yes" |
1084 | swcodec="yes" | 1062 | swcodec="yes" |
1085 | bootoutput="bootloader-$archos.ipod" | 1063 | bootoutput="bootloader-$modelname.ipod" |
1086 | # toolset is the tools within the tools directory that we build for | 1064 | # toolset is the tools within the tools directory that we build for |
1087 | # this particular target. | 1065 | # this particular target. |
1088 | toolset=$ipodbitmaptools | 1066 | toolset=$ipodbitmaptools |
@@ -1094,7 +1072,7 @@ EOF | |||
1094 | 1072 | ||
1095 | 25|ipodmini) | 1073 | 25|ipodmini) |
1096 | target_id=18 | 1074 | target_id=18 |
1097 | archos="ipodmini" | 1075 | modelname="ipodmini" |
1098 | target="-DIPOD_MINI" | 1076 | target="-DIPOD_MINI" |
1099 | memory=32 # always | 1077 | memory=32 # always |
1100 | arm7tdmicc | 1078 | arm7tdmicc |
@@ -1103,11 +1081,9 @@ EOF | |||
1103 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" | 1081 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" |
1104 | output="rockbox.ipod" | 1082 | output="rockbox.ipod" |
1105 | appextra="recorder:gui" | 1083 | appextra="recorder:gui" |
1106 | archosrom="" | ||
1107 | flash="" | ||
1108 | plugins="yes" | 1084 | plugins="yes" |
1109 | swcodec="yes" | 1085 | swcodec="yes" |
1110 | bootoutput="bootloader-$archos.ipod" | 1086 | bootoutput="bootloader-$modelname.ipod" |
1111 | # toolset is the tools within the tools directory that we build for | 1087 | # toolset is the tools within the tools directory that we build for |
1112 | # this particular target. | 1088 | # this particular target. |
1113 | toolset=$ipodbitmaptools | 1089 | toolset=$ipodbitmaptools |
@@ -1119,7 +1095,7 @@ EOF | |||
1119 | 1095 | ||
1120 | 26|ipodmini2g) | 1096 | 26|ipodmini2g) |
1121 | target_id=21 | 1097 | target_id=21 |
1122 | archos="ipodmini2g" | 1098 | modelname="ipodmini2g" |
1123 | target="-DIPOD_MINI2G" | 1099 | target="-DIPOD_MINI2G" |
1124 | memory=32 # always | 1100 | memory=32 # always |
1125 | arm7tdmicc | 1101 | arm7tdmicc |
@@ -1128,11 +1104,9 @@ EOF | |||
1128 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" | 1104 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" |
1129 | output="rockbox.ipod" | 1105 | output="rockbox.ipod" |
1130 | appextra="recorder:gui" | 1106 | appextra="recorder:gui" |
1131 | archosrom="" | ||
1132 | flash="" | ||
1133 | plugins="yes" | 1107 | plugins="yes" |
1134 | swcodec="yes" | 1108 | swcodec="yes" |
1135 | bootoutput="bootloader-$archos.ipod" | 1109 | bootoutput="bootloader-$modelname.ipod" |
1136 | # toolset is the tools within the tools directory that we build for | 1110 | # toolset is the tools within the tools directory that we build for |
1137 | # this particular target. | 1111 | # this particular target. |
1138 | toolset=$ipodbitmaptools | 1112 | toolset=$ipodbitmaptools |
@@ -1144,7 +1118,7 @@ EOF | |||
1144 | 1118 | ||
1145 | 27|ipod1g2g) | 1119 | 27|ipod1g2g) |
1146 | target_id=29 | 1120 | target_id=29 |
1147 | archos="ipod1g2g" | 1121 | modelname="ipod1g2g" |
1148 | target="-DIPOD_1G2G" | 1122 | target="-DIPOD_1G2G" |
1149 | memory=32 # always | 1123 | memory=32 # always |
1150 | arm7tdmicc | 1124 | arm7tdmicc |
@@ -1153,11 +1127,9 @@ EOF | |||
1153 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" | 1127 | bmp2rb_native="$rootdir/tools/bmp2rb -f 6" |
1154 | output="rockbox.ipod" | 1128 | output="rockbox.ipod" |
1155 | appextra="recorder:gui" | 1129 | appextra="recorder:gui" |
1156 | archosrom="" | ||
1157 | flash="" | ||
1158 | plugins="yes" | 1130 | plugins="yes" |
1159 | swcodec="yes" | 1131 | swcodec="yes" |
1160 | bootoutput="bootloader-$archos.ipod" | 1132 | bootoutput="bootloader-$modelname.ipod" |
1161 | # toolset is the tools within the tools directory that we build for | 1133 | # toolset is the tools within the tools directory that we build for |
1162 | # this particular target. | 1134 | # this particular target. |
1163 | toolset=$ipodbitmaptools | 1135 | toolset=$ipodbitmaptools |
@@ -1169,7 +1141,7 @@ EOF | |||
1169 | 1141 | ||
1170 | 30|x5) | 1142 | 30|x5) |
1171 | target_id=12 | 1143 | target_id=12 |
1172 | archos="x5" | 1144 | modelname="x5" |
1173 | target="-DIAUDIO_X5" | 1145 | target="-DIAUDIO_X5" |
1174 | memory=16 # always | 1146 | memory=16 # always |
1175 | coldfirecc | 1147 | coldfirecc |
@@ -1180,8 +1152,6 @@ EOF | |||
1180 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7" | 1152 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7" |
1181 | output="rockbox.iaudio" | 1153 | output="rockbox.iaudio" |
1182 | appextra="recorder:gui" | 1154 | appextra="recorder:gui" |
1183 | archosrom="" | ||
1184 | flash="" | ||
1185 | plugins="yes" | 1155 | plugins="yes" |
1186 | swcodec="yes" | 1156 | swcodec="yes" |
1187 | # toolset is the tools within the tools directory that we build for | 1157 | # toolset is the tools within the tools directory that we build for |
@@ -1195,7 +1165,7 @@ EOF | |||
1195 | 1165 | ||
1196 | 31|m5) | 1166 | 31|m5) |
1197 | target_id=28 | 1167 | target_id=28 |
1198 | archos="m5" | 1168 | modelname="m5" |
1199 | target="-DIAUDIO_M5" | 1169 | target="-DIAUDIO_M5" |
1200 | memory=16 # always | 1170 | memory=16 # always |
1201 | coldfirecc | 1171 | coldfirecc |
@@ -1206,8 +1176,6 @@ EOF | |||
1206 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7" | 1176 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7" |
1207 | output="rockbox.iaudio" | 1177 | output="rockbox.iaudio" |
1208 | appextra="recorder:gui" | 1178 | appextra="recorder:gui" |
1209 | archosrom="" | ||
1210 | flash="" | ||
1211 | plugins="yes" | 1179 | plugins="yes" |
1212 | swcodec="yes" | 1180 | swcodec="yes" |
1213 | # toolset is the tools within the tools directory that we build for | 1181 | # toolset is the tools within the tools directory that we build for |
@@ -1221,7 +1189,7 @@ EOF | |||
1221 | 1189 | ||
1222 | 40|gigabeatf) | 1190 | 40|gigabeatf) |
1223 | target_id=20 | 1191 | target_id=20 |
1224 | archos="gigabeatf" | 1192 | modelname="gigabeatf" |
1225 | target="-DGIGABEAT_F" | 1193 | target="-DGIGABEAT_F" |
1226 | memory=32 # always | 1194 | memory=32 # always |
1227 | arm9tdmicc | 1195 | arm9tdmicc |
@@ -1230,8 +1198,6 @@ EOF | |||
1230 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1198 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
1231 | output="rockbox.gigabeat" | 1199 | output="rockbox.gigabeat" |
1232 | appextra="recorder:gui" | 1200 | appextra="recorder:gui" |
1233 | archosrom="" | ||
1234 | flash="" | ||
1235 | plugins="yes" | 1201 | plugins="yes" |
1236 | swcodec="yes" | 1202 | swcodec="yes" |
1237 | toolset=$gigabeatbitmaptools | 1203 | toolset=$gigabeatbitmaptools |
@@ -1245,7 +1211,7 @@ EOF | |||
1245 | 1211 | ||
1246 | 41|gigabeats) | 1212 | 41|gigabeats) |
1247 | target_id=26 | 1213 | target_id=26 |
1248 | archos="gigabeats" | 1214 | modelname="gigabeats" |
1249 | target="-DGIGABEAT_S" | 1215 | target="-DGIGABEAT_S" |
1250 | memory=32 # always | 1216 | memory=32 # always |
1251 | arm9tdmicc | 1217 | arm9tdmicc |
@@ -1254,8 +1220,6 @@ EOF | |||
1254 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1220 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
1255 | output="rockbox.gigabeat" | 1221 | output="rockbox.gigabeat" |
1256 | appextra="recorder:gui" | 1222 | appextra="recorder:gui" |
1257 | archosrom="" | ||
1258 | flash="" | ||
1259 | plugins="" | 1223 | plugins="" |
1260 | swcodec="yes" | 1224 | swcodec="yes" |
1261 | toolset="$gigabeatbitmaptools mknkboot" | 1225 | toolset="$gigabeatbitmaptools mknkboot" |
@@ -1269,7 +1233,7 @@ EOF | |||
1269 | 1233 | ||
1270 | 70|mrobe500) | 1234 | 70|mrobe500) |
1271 | target_id=20 | 1235 | target_id=20 |
1272 | archos="mrobe500" | 1236 | modelname="mrobe500" |
1273 | target="-DMROBE_500" | 1237 | target="-DMROBE_500" |
1274 | memory=64 # always | 1238 | memory=64 # always |
1275 | arm926ejscc | 1239 | arm926ejscc |
@@ -1281,8 +1245,6 @@ EOF | |||
1281 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" | 1245 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" |
1282 | output="rockbox.mrobe500" | 1246 | output="rockbox.mrobe500" |
1283 | appextra="recorder:gui" | 1247 | appextra="recorder:gui" |
1284 | archosrom="" | ||
1285 | flash="" | ||
1286 | plugins="yes" | 1248 | plugins="yes" |
1287 | swcodec="yes" | 1249 | swcodec="yes" |
1288 | toolset=$gigabeatbitmaptools | 1250 | toolset=$gigabeatbitmaptools |
@@ -1296,7 +1258,7 @@ EOF | |||
1296 | 1258 | ||
1297 | 71|mrobe100) | 1259 | 71|mrobe100) |
1298 | target_id=33 | 1260 | target_id=33 |
1299 | archos="mrobe100" | 1261 | modelname="mrobe100" |
1300 | target="-DMROBE_100" | 1262 | target="-DMROBE_100" |
1301 | memory=32 # always | 1263 | memory=32 # always |
1302 | arm7tdmicc | 1264 | arm7tdmicc |
@@ -1307,8 +1269,6 @@ EOF | |||
1307 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" | 1269 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" |
1308 | output="rockbox.mi4" | 1270 | output="rockbox.mi4" |
1309 | appextra="recorder:gui" | 1271 | appextra="recorder:gui" |
1310 | archosrom="" | ||
1311 | flash="" | ||
1312 | plugins="yes" | 1272 | plugins="yes" |
1313 | swcodec="yes" | 1273 | swcodec="yes" |
1314 | boottool="$rootdir/tools/scramble -mi4v2 -model=m100 -type=RBBL" | 1274 | boottool="$rootdir/tools/scramble -mi4v2 -model=m100 -type=RBBL" |
@@ -1324,7 +1284,7 @@ EOF | |||
1324 | 1284 | ||
1325 | 80|logikdax) | 1285 | 80|logikdax) |
1326 | target_id=31 | 1286 | target_id=31 |
1327 | archos="logikdax" | 1287 | modelname="logikdax" |
1328 | target="-DLOGIK_DAX" | 1288 | target="-DLOGIK_DAX" |
1329 | memory=2 # always | 1289 | memory=2 # always |
1330 | arm946cc | 1290 | arm946cc |
@@ -1335,8 +1295,6 @@ EOF | |||
1335 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" | 1295 | bmp2rb_native="$rootdir/tools/bmp2rb -f 0" |
1336 | output="rockbox.logik" | 1296 | output="rockbox.logik" |
1337 | appextra="recorder:gui" | 1297 | appextra="recorder:gui" |
1338 | archosrom="" | ||
1339 | flash="" | ||
1340 | plugins="no" | 1298 | plugins="no" |
1341 | swcodec="yes" | 1299 | swcodec="yes" |
1342 | # toolset is the tools within the tools directory that we build for | 1300 | # toolset is the tools within the tools directory that we build for |
@@ -1350,7 +1308,7 @@ EOF | |||
1350 | 1308 | ||
1351 | 50|e200) | 1309 | 50|e200) |
1352 | target_id=23 | 1310 | target_id=23 |
1353 | archos="e200" | 1311 | modelname="e200" |
1354 | target="-DSANSA_E200" | 1312 | target="-DSANSA_E200" |
1355 | memory=32 # supposedly | 1313 | memory=32 # supposedly |
1356 | arm7tdmicc | 1314 | arm7tdmicc |
@@ -1359,8 +1317,6 @@ EOF | |||
1359 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1317 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
1360 | output="rockbox.mi4" | 1318 | output="rockbox.mi4" |
1361 | appextra="recorder:gui" | 1319 | appextra="recorder:gui" |
1362 | archosrom="" | ||
1363 | flash="" | ||
1364 | plugins="yes" | 1320 | plugins="yes" |
1365 | swcodec="yes" | 1321 | swcodec="yes" |
1366 | boottool="$rootdir/tools/scramble -mi4v3 -model=e200 -type=RBBL" | 1322 | boottool="$rootdir/tools/scramble -mi4v3 -model=e200 -type=RBBL" |
@@ -1379,7 +1335,7 @@ EOF | |||
1379 | # different option to the scramble tool when building a bootloader and | 1335 | # different option to the scramble tool when building a bootloader and |
1380 | # makes the bootloader output file name in all lower case. | 1336 | # makes the bootloader output file name in all lower case. |
1381 | target_id=27 | 1337 | target_id=27 |
1382 | archos="e200r" | 1338 | modelname="e200r" |
1383 | target="-DSANSA_E200" | 1339 | target="-DSANSA_E200" |
1384 | memory=32 # supposedly | 1340 | memory=32 # supposedly |
1385 | arm7tdmicc | 1341 | arm7tdmicc |
@@ -1388,8 +1344,6 @@ EOF | |||
1388 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1344 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
1389 | output="rockbox.mi4" | 1345 | output="rockbox.mi4" |
1390 | appextra="recorder:gui" | 1346 | appextra="recorder:gui" |
1391 | archosrom="" | ||
1392 | flash="" | ||
1393 | plugins="yes" | 1347 | plugins="yes" |
1394 | swcodec="yes" | 1348 | swcodec="yes" |
1395 | boottool="$rootdir/tools/scramble -mi4r -model=e20r -type=RBBL" | 1349 | boottool="$rootdir/tools/scramble -mi4r -model=e20r -type=RBBL" |
@@ -1405,7 +1359,7 @@ EOF | |||
1405 | 1359 | ||
1406 | 52|c200) | 1360 | 52|c200) |
1407 | target_id=30 | 1361 | target_id=30 |
1408 | archos="c200" | 1362 | modelname="c200" |
1409 | target="-DSANSA_C200" | 1363 | target="-DSANSA_C200" |
1410 | memory=32 # supposedly | 1364 | memory=32 # supposedly |
1411 | arm7tdmicc | 1365 | arm7tdmicc |
@@ -1414,8 +1368,6 @@ EOF | |||
1414 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1368 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
1415 | output="rockbox.mi4" | 1369 | output="rockbox.mi4" |
1416 | appextra="recorder:gui" | 1370 | appextra="recorder:gui" |
1417 | archosrom="" | ||
1418 | flash="" | ||
1419 | plugins="yes" | 1371 | plugins="yes" |
1420 | swcodec="yes" | 1372 | swcodec="yes" |
1421 | boottool="$rootdir/tools/scramble -mi4v3 -model=c200 -type=RBBL" | 1373 | boottool="$rootdir/tools/scramble -mi4v3 -model=c200 -type=RBBL" |
@@ -1431,7 +1383,7 @@ EOF | |||
1431 | 1383 | ||
1432 | 60|tpj1022) | 1384 | 60|tpj1022) |
1433 | target_id=25 | 1385 | target_id=25 |
1434 | archos="tpj1022" | 1386 | modelname="tpj1022" |
1435 | target="-DELIO_TPJ1022" | 1387 | target="-DELIO_TPJ1022" |
1436 | memory=32 # always | 1388 | memory=32 # always |
1437 | arm7tdmicc | 1389 | arm7tdmicc |
@@ -1440,8 +1392,6 @@ EOF | |||
1440 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" | 1392 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" |
1441 | output="rockbox.elio" | 1393 | output="rockbox.elio" |
1442 | appextra="recorder:gui" | 1394 | appextra="recorder:gui" |
1443 | archosrom="" | ||
1444 | flash="" | ||
1445 | plugins="yes" | 1395 | plugins="yes" |
1446 | swcodec="yes" | 1396 | swcodec="yes" |
1447 | boottool="$rootdir/tools/scramble -mi4v2" | 1397 | boottool="$rootdir/tools/scramble -mi4v2" |
@@ -1457,7 +1407,7 @@ EOF | |||
1457 | 1407 | ||
1458 | 32|iaudio7) | 1408 | 32|iaudio7) |
1459 | target_id=32 | 1409 | target_id=32 |
1460 | archos="iaudio7" | 1410 | modelname="iaudio7" |
1461 | target="-DIAUDIO_7" | 1411 | target="-DIAUDIO_7" |
1462 | memory=16 # always | 1412 | memory=16 # always |
1463 | arm946cc | 1413 | arm946cc |
@@ -1467,8 +1417,6 @@ EOF | |||
1467 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" | 1417 | bmp2rb_native="$rootdir/tools/bmp2rb -f 5" |
1468 | output="rockbox.iaudio" | 1418 | output="rockbox.iaudio" |
1469 | appextra="recorder:gui" | 1419 | appextra="recorder:gui" |
1470 | archosrom="" | ||
1471 | flash="" | ||
1472 | plugins="yes" | 1420 | plugins="yes" |
1473 | swcodec="yes" | 1421 | swcodec="yes" |
1474 | bootoutput="I7_FW.BIN" | 1422 | bootoutput="I7_FW.BIN" |
@@ -1483,7 +1431,7 @@ EOF | |||
1483 | 1431 | ||
1484 | 33|cowond2) | 1432 | 33|cowond2) |
1485 | target_id=34 | 1433 | target_id=34 |
1486 | archos="cowond2" | 1434 | modelname="cowond2" |
1487 | target="-DCOWON_D2" | 1435 | target="-DCOWON_D2" |
1488 | memory=32 | 1436 | memory=32 |
1489 | arm926ejscc | 1437 | arm926ejscc |
@@ -1495,8 +1443,6 @@ EOF | |||
1495 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" | 1443 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" |
1496 | output="rockbox.iaudio" | 1444 | output="rockbox.iaudio" |
1497 | appextra="recorder:gui" | 1445 | appextra="recorder:gui" |
1498 | archosrom="" | ||
1499 | flash="" | ||
1500 | plugins="no" | 1446 | plugins="no" |
1501 | swcodec="yes" | 1447 | swcodec="yes" |
1502 | toolset="$tccbitmaptools" | 1448 | toolset="$tccbitmaptools" |
@@ -1513,7 +1459,7 @@ EOF | |||
1513 | 1459 | ||
1514 | esac | 1460 | esac |
1515 | 1461 | ||
1516 | echo "Platform set to $archos" | 1462 | echo "Platform set to $modelname" |
1517 | 1463 | ||
1518 | 1464 | ||
1519 | #remove start | 1465 | #remove start |
@@ -1562,7 +1508,7 @@ fi | |||
1562 | 1508 | ||
1563 | # the ifp7x0 is the only platform that supports building a gdb stub like | 1509 | # the ifp7x0 is the only platform that supports building a gdb stub like |
1564 | # this | 1510 | # this |
1565 | case $archos in | 1511 | case $modelname in |
1566 | ifp7xx) | 1512 | ifp7xx) |
1567 | gdbstub="(G)DB stub, " | 1513 | gdbstub="(G)DB stub, " |
1568 | ;; | 1514 | ;; |
@@ -1621,7 +1567,7 @@ fi | |||
1621 | extradefines="-DSTUB" # for target makefile symbol EXTRA_DEFINES | 1567 | extradefines="-DSTUB" # for target makefile symbol EXTRA_DEFINES |
1622 | appsdir='\$(ROOTDIR)/gdb' | 1568 | appsdir='\$(ROOTDIR)/gdb' |
1623 | apps="stub" | 1569 | apps="stub" |
1624 | case $archos in | 1570 | case $modelname in |
1625 | ifp7xx) | 1571 | ifp7xx) |
1626 | output="stub.wma" | 1572 | output="stub.wma" |
1627 | ;; | 1573 | ;; |
@@ -1639,7 +1585,7 @@ fi | |||
1639 | echo "Manual build selected" | 1585 | echo "Manual build selected" |
1640 | ;; | 1586 | ;; |
1641 | *) | 1587 | *) |
1642 | if [ "$archos" = "e200r" ]; then | 1588 | if [ "$modelname" = "e200r" ]; then |
1643 | echo "Do not use the e200R target for regular builds. Use e200 instead." | 1589 | echo "Do not use the e200R target for regular builds. Use e200 instead." |
1644 | exit | 1590 | exit |
1645 | fi | 1591 | fi |
@@ -1649,7 +1595,7 @@ fi | |||
1649 | 1595 | ||
1650 | esac | 1596 | esac |
1651 | # to be able running "make manual" from non-manual configuration | 1597 | # to be able running "make manual" from non-manual configuration |
1652 | case $archos in | 1598 | case $modelname in |
1653 | fmrecorder) | 1599 | fmrecorder) |
1654 | manualdev="recorderv2fm" | 1600 | manualdev="recorderv2fm" |
1655 | ;; | 1601 | ;; |
@@ -1663,7 +1609,7 @@ fi | |||
1663 | manualdev="ipodmini" | 1609 | manualdev="ipodmini" |
1664 | ;; | 1610 | ;; |
1665 | *) | 1611 | *) |
1666 | manualdev=$archos | 1612 | manualdev=$modelname |
1667 | ;; | 1613 | ;; |
1668 | esac | 1614 | esac |
1669 | 1615 | ||
@@ -1842,7 +1788,7 @@ sed > Makefile \ | |||
1842 | -e "s,@TARGET@,${target},g" \ | 1788 | -e "s,@TARGET@,${target},g" \ |
1843 | -e "s,@CPU@,${t_cpu},g" \ | 1789 | -e "s,@CPU@,${t_cpu},g" \ |
1844 | -e "s,@MANUFACTURER@,${t_manufacturer},g" \ | 1790 | -e "s,@MANUFACTURER@,${t_manufacturer},g" \ |
1845 | -e "s,@ARCHOS@,${archos},g" \ | 1791 | -e "s,@MODELNAME@,${modelname},g" \ |
1846 | -e "s,@LANGUAGE@,${language},g" \ | 1792 | -e "s,@LANGUAGE@,${language},g" \ |
1847 | -e "s:@VOICELANGUAGE@:${voicelanguage}:g" \ | 1793 | -e "s:@VOICELANGUAGE@:${voicelanguage}:g" \ |
1848 | -e "s,@PWD@,${pwd},g" \ | 1794 | -e "s,@PWD@,${pwd},g" \ |
@@ -1913,7 +1859,7 @@ export TOOLSDIR=@TOOLSDIR@ | |||
1913 | export DOCSDIR=\$(ROOTDIR)/docs | 1859 | export DOCSDIR=\$(ROOTDIR)/docs |
1914 | export MANUALDIR=\${ROOTDIR}/manual | 1860 | export MANUALDIR=\${ROOTDIR}/manual |
1915 | export DEBUG=@DEBUG@ | 1861 | export DEBUG=@DEBUG@ |
1916 | export ARCHOS=@ARCHOS@ | 1862 | export MODELNAME=@MODELNAME@ |
1917 | export ARCHOSROM=@ARCHOSROM@ | 1863 | export ARCHOSROM=@ARCHOSROM@ |
1918 | export FLASHFILE=@FLASHFILE@ | 1864 | export FLASHFILE=@FLASHFILE@ |
1919 | export TARGET_ID=@TARGET_ID@ | 1865 | export TARGET_ID=@TARGET_ID@ |
@@ -2017,27 +1963,27 @@ tags: | |||
2017 | \$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins/lib tags | 1963 | \$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins/lib tags |
2018 | 1964 | ||
2019 | fontzip: | 1965 | fontzip: |
2020 | \$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -f 1 -o rockbox-fonts.zip \$(TARGET) \$(BINARY) | 1966 | \$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\" -r "\$(ROOTDIR)" -f 1 -o rockbox-fonts.zip \$(TARGET) \$(BINARY) |
2021 | 1967 | ||
2022 | zip: | 1968 | zip: |
2023 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ | 1969 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ |
2024 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) | 1970 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) |
2025 | 1971 | ||
2026 | mapzip: | 1972 | mapzip: |
2027 | \$(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip | 1973 | \$(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip |
2028 | 1974 | ||
2029 | fullzip: | 1975 | fullzip: |
2030 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\ | 1976 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\ |
2031 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\" -r "\$(ROOTDIR)" -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY) | 1977 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -r "\$(ROOTDIR)" -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY) |
2032 | 1978 | ||
2033 | 7zip: | 1979 | 7zip: |
2034 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\ | 1980 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\ |
2035 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\" -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) | 1981 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) |
2036 | 1982 | ||
2037 | tar: | 1983 | tar: |
2038 | \$(SILENT)rm -f rockbox.tar | 1984 | \$(SILENT)rm -f rockbox.tar |
2039 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\ | 1985 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\ |
2040 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\" -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) | 1986 | \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) |
2041 | 1987 | ||
2042 | bzip2: tar | 1988 | bzip2: tar |
2043 | \$(SILENT)bzip2 -f9 rockbox.tar | 1989 | \$(SILENT)bzip2 -f9 rockbox.tar |
@@ -2102,7 +2048,7 @@ if [ "yes" = "$voice" ]; then | |||
2102 | 2048 | ||
2103 | voice: voicetools features | 2049 | voice: voicetools features |
2104 | \$(SILENT)for f in \`cat \$(BUILDDIR)/${apps}/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ | 2050 | \$(SILENT)for f in \`cat \$(BUILDDIR)/${apps}/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ |
2105 | for lang in \`echo \$(VOICELANGUAGE) |sed "s/,/ /g"\`; do \$(TOOLSDIR)/voice.pl -V -l=\$\$lang -t=\$(ARCHOS)\$\$feat -i=\$(TARGET_ID) -e="\$(ENCODER)" -E="\$(ENC_OPTS)" -s=\$(TTS_ENGINE) -S="\$(TTS_OPTS)"; done \\ | 2051 | for lang in \`echo \$(VOICELANGUAGE) |sed "s/,/ /g"\`; do \$(TOOLSDIR)/voice.pl -V -l=\$\$lang -t=\$(MODELNAME)\$\$feat -i=\$(TARGET_ID) -e="\$(ENCODER)" -E="\$(ENC_OPTS)" -s=\$(TTS_ENGINE) -S="\$(TTS_OPTS)"; done \\ |
2106 | EOF | 2052 | EOF |
2107 | 2053 | ||
2108 | fi | 2054 | fi |
diff --git a/uisimulator/sdl/Makefile b/uisimulator/sdl/Makefile index 7946ef31a2..dc76b35d68 100644 --- a/uisimulator/sdl/Makefile +++ b/uisimulator/sdl/Makefile | |||
@@ -7,7 +7,7 @@ | |||
7 | # \/ \/ \/ \/ \/ | 7 | # \/ \/ \/ \/ \/ |
8 | # $Id$ | 8 | # $Id$ |
9 | # | 9 | # |
10 | # Copyright (C) 2002 by Daniel Stenberg <daniel@haxx.se> | 10 | # Copyright (C) 2002, 2008 by Daniel Stenberg <daniel@haxx.se> |
11 | # | 11 | # |
12 | # All files in this archive are subject to the GNU General Public License. | 12 | # All files in this archive are subject to the GNU General Public License. |
13 | # See the file COPYING in the source tree root for full license agreement. | 13 | # See the file COPYING in the source tree root for full license agreement. |
@@ -25,8 +25,8 @@ RM = rm -f | |||
25 | DEBUG = -g | 25 | DEBUG = -g |
26 | 26 | ||
27 | # Use this for simulator-only files | 27 | # Use this for simulator-only files |
28 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) $(TARGET_INC) -I$(FIRMDIR)/export -I$(APPSDIR) \ | 28 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) $(TARGET_INC) -I$(FIRMDIR)/export \ |
29 | -I$(BUILDDIR) | 29 | -I$(APPSDIR) -I$(BUILDDIR) |
30 | 30 | ||
31 | # This sets up 'SRC' based on the files mentioned in SOURCES | 31 | # This sets up 'SRC' based on the files mentioned in SOURCES |
32 | include $(TOOLSDIR)/makesrc.inc | 32 | include $(TOOLSDIR)/makesrc.inc |
@@ -58,7 +58,7 @@ clean: | |||
58 | $(SILENT)$(MAKE) -C $(SIMCOMMON) clean | 58 | $(SILENT)$(MAKE) -C $(SIMCOMMON) clean |
59 | 59 | ||
60 | ################## Specific dependencies ################## | 60 | ################## Specific dependencies ################## |
61 | $(BUILDDIR)/UI256.bmp: UI-$(ARCHOS).bmp | 61 | $(BUILDDIR)/UI256.bmp: UI-$(MODELNAME).bmp |
62 | $(call PRINTS,UI)cp $< $@ | 62 | $(call PRINTS,UI)cp $< $@ |
63 | 63 | ||
64 | -include $(DEPFILE) | 64 | -include $(DEPFILE) |