diff -u -r ./rockbox-all/tools/configure /home/slm/projets/rockbox/src/rockbox-all/tools/configure --- ./rockbox-all/tools/configure 2006-02-04 00:58:01.000000000 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/configure 2006-02-04 20:20:47.000000000 +0100 @@ -5,7 +5,7 @@ # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ # \/ \/ \/ \/ \/ -# $Id: configure,v 1.165 2006/02/03 23:58:01 linus Exp $ +# $Id: configure,v 1.164 2006/01/25 01:41:22 tomal Exp $ # # global CC options for all platforms @@ -14,7 +14,7 @@ use_logf="#undef ROCKBOX_HAS_LOGF" use_simsound="#undef ROCKBOX_HAS_SIMSOUND" -scriptver=`echo '$Revision: 1.165 $' | sed -e 's:\\$::g' -e 's/Revision: //'` +scriptver=`echo '$Revision: 1.164 $' | sed -e 's:\\$::g' -e 's/Revision: //'` # # Begin Function Definitions @@ -406,6 +406,7 @@ echo "full path to the source code directory here:" firmdir=`input` + rootdir=$firmdir fi ##################################################################### @@ -447,7 +448,8 @@ echo "13 - iPod Color/Photo" echo "14 - iPod Nano" echo "15 - iPod Video" - echo "16 - iriver iFP-790" + echo "16 - iPod 3G" + echo "17 - iriver iFP-790" target_id=`input`; @@ -752,6 +754,25 @@ ;; 16) + archos="ipodcolor" + target="-DIPOD_3G" + memory=32 # always + arm7tdmicc + tool="$rootdir/tools/scramble -add=ipco" + bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" + bmp2rb_native="$rootdir/tools/bmp2rb -f 4" + output="rockbox.ipod" + appextra="recorder:gui" + archosrom="" + flash="" + plugins="yes" + codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" + # toolset is the tools within the tools directory that we build for + # this particular target. + toolset=$ipodbitmaptools + ;; + + 17) archos="ifp7xx" target="-DIRIVER_IFP7XX" memory=1 @@ -814,7 +835,7 @@ case $option in [Bb]) case $archos in - h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo) + h100|h120|h300|ipodcolor|ipodnano|ipodvideo) extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES appsdir='\$(ROOTDIR)/bootloader' apps="bootloader" Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools: .#configure.1.158 Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools: .#configure.1.161 diff -u -r ./rockbox-all/tools/CVS/Entries /home/slm/projets/rockbox/src/rockbox-all/tools/CVS/Entries --- ./rockbox-all/tools/CVS/Entries 2006-02-05 16:54:12.955876952 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/CVS/Entries 2006-02-04 23:43:44.000000000 +0100 @@ -1,28 +1,30 @@ /.cvsignore/1.1/Sat Sep 25 21:06:41 2004// -/FILES/1.17/Fri Jan 27 21:20:20 2006// +/FILES/1.17/Wed Feb 1 22:11:09 2006// /Makefile/1.28/Tue Dec 6 15:04:48 2005// /bdf2bmp.c/1.1/Fri May 21 17:03:37 2004// /binlang/1.15/Mon Jan 31 00:34:32 2005// /bmp2rb.c/1.14/Wed Nov 30 09:06:43 2005// -/buildzip.pl/1.44/Thu Feb 2 20:42:56 2006// +/buildzip.pl/1.44/Sat Feb 4 22:43:28 2006// /codepage_tables.c/1.2/Tue Jan 10 17:12:33 2006// /codepage_tables.h/1.2/Tue Jan 10 17:12:33 2006// /codepages.c/1.3/Tue Jan 10 17:12:33 2006// -/configure/1.165/Fri Feb 3 23:58:01 2006// +/configure/1.164/Result of merge// /convbdf.c/1.18/Thu Dec 8 19:25:15 2005// /descramble.c/1.8/Tue Dec 27 23:14:49 2005// /dict2rdf.pl/1.1/Wed Jun 8 21:01:26 2005// +D/fwpatcher//// /generate_rocklatin.c/1.3/Mon Nov 21 16:08:36 2005// /genlang/1.19/Sun Jul 31 21:58:49 2005// /genlang2/1.1/Thu Sep 22 11:22:43 2005// /iaudio.c/1.3/Mon Nov 21 16:08:36 2005// -/ipod_fw.c/1.3/Mon Jan 16 00:01:05 2006// +/ipod_fw.c/1.3/Mon Jan 23 22:56:08 2006// /iriver.c/1.2/Fri Jan 28 12:21:52 2005// /iriver.h/1.1/Mon Jan 24 09:01:48 2005// -/make.inc/1.11/Mon Jan 16 22:45:44 2006// +/make.inc/1.11/Mon Jan 23 22:56:08 2006// /makebmp.inc/1.1/Sun Jan 22 21:30:32 2006// /makesrc.inc/1.2/Thu Mar 10 08:19:54 2005// /mkboot.c/1.4/Fri Nov 18 23:00:40 2005// +D/profile_reader//// /rdf2binary.c/1.4/Sun Jun 5 14:23:15 2005// /release/1.2/Wed May 29 12:56:35 2002// /rockbox-style.el/1.3/Fri Jan 24 10:29:13 2003// @@ -32,8 +34,8 @@ /sh2d.c/1.5/Mon Nov 21 16:03:36 2005// /songdb.pl/1.41/Fri Sep 9 07:35:09 2005// /testdbv2.c/1.5/Fri Jul 1 17:29:44 2005// +D/ucl//// /ucl2src.pl/1.1/Wed Nov 30 00:05:40 2005// /uplang/1.8/Mon Feb 7 22:33:32 2005// /vorbiscomm.pm/1.4/Fri Jul 15 06:44:41 2005// /wn2rdf.pl/1.1/Mon May 2 15:05:07 2005// -D Seulement dans ./rockbox-all/tools/CVS: Entries.Log diff -u -r ./rockbox-all/tools/CVS/Root /home/slm/projets/rockbox/src/rockbox-all/tools/CVS/Root --- ./rockbox-all/tools/CVS/Root 2006-02-05 16:54:10.549242816 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/CVS/Root 2006-01-16 17:29:05.000000000 +0100 @@ -1 +1 @@ -:pserver:anonymous@www.rockbox.org:/cvsroot/rockbox +:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools/CVS: Template diff -u -r ./rockbox-all/tools/fwpatcher/CVS/Root /home/slm/projets/rockbox/src/rockbox-all/tools/fwpatcher/CVS/Root --- ./rockbox-all/tools/fwpatcher/CVS/Root 2006-02-05 16:54:12.955876952 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/fwpatcher/CVS/Root 2006-01-16 17:29:06.000000000 +0100 @@ -1 +1 @@ -:pserver:anonymous@www.rockbox.org:/cvsroot/rockbox +:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools/fwpatcher/CVS: Template Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools: iriver.o diff -u -r ./rockbox-all/tools/profile_reader/CVS/Root /home/slm/projets/rockbox/src/rockbox-all/tools/profile_reader/CVS/Root --- ./rockbox-all/tools/profile_reader/CVS/Root 2006-02-05 16:54:13.092856128 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/profile_reader/CVS/Root 2006-01-23 23:56:08.000000000 +0100 @@ -1 +1 @@ -:pserver:anonymous@www.rockbox.org:/cvsroot/rockbox +:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools/profile_reader/CVS: Template diff -u -r ./rockbox-all/tools/ucl/CVS/Entries /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/CVS/Entries --- ./rockbox-all/tools/ucl/CVS/Entries 2006-02-05 16:54:13.127850808 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/CVS/Entries 2006-02-05 00:03:24.000000000 +0100 @@ -1,4 +1,5 @@ /Makefile/1.1/Mon Nov 28 00:03:59 2005// /lutil.h/1.1/Mon Nov 28 00:03:59 2005// /uclpack.c/1.2/Sun Nov 27 23:44:25 2005// -D +D/include//// +D/src//// Seulement dans ./rockbox-all/tools/ucl/CVS: Entries.Log diff -u -r ./rockbox-all/tools/ucl/CVS/Root /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/CVS/Root --- ./rockbox-all/tools/ucl/CVS/Root 2006-02-05 16:54:13.104854304 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/CVS/Root 2006-01-16 17:29:06.000000000 +0100 @@ -1 +1 @@ -:pserver:anonymous@www.rockbox.org:/cvsroot/rockbox +:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/CVS: Template diff -u -r ./rockbox-all/tools/ucl/include/CVS/Entries /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/CVS/Entries --- ./rockbox-all/tools/ucl/include/CVS/Entries 2006-02-05 16:54:13.128850656 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/CVS/Entries 2006-02-05 00:03:24.000000000 +0100 @@ -1 +1 @@ -D +D/ucl//// Seulement dans ./rockbox-all/tools/ucl/include/CVS: Entries.Log diff -u -r ./rockbox-all/tools/ucl/include/CVS/Root /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/CVS/Root --- ./rockbox-all/tools/ucl/include/CVS/Root 2006-02-05 16:54:13.128850656 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/CVS/Root 2006-01-16 17:29:07.000000000 +0100 @@ -1 +1 @@ -:pserver:anonymous@www.rockbox.org:/cvsroot/rockbox +:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/CVS: Template diff -u -r ./rockbox-all/tools/ucl/include/ucl/CVS/Root /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/ucl/CVS/Root --- ./rockbox-all/tools/ucl/include/ucl/CVS/Root 2006-02-05 16:54:13.128850656 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/ucl/CVS/Root 2006-01-16 17:29:07.000000000 +0100 @@ -1 +1 @@ -:pserver:anonymous@www.rockbox.org:/cvsroot/rockbox +:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/include/ucl/CVS: Template diff -u -r ./rockbox-all/tools/ucl/src/CVS/Root /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/src/CVS/Root --- ./rockbox-all/tools/ucl/src/CVS/Root 2006-02-05 16:54:13.382812048 +0100 +++ /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/src/CVS/Root 2006-01-16 17:29:07.000000000 +0100 @@ -1 +1 @@ -:pserver:anonymous@www.rockbox.org:/cvsroot/rockbox +:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox Seulement dans /home/slm/projets/rockbox/src/rockbox-all/tools/ucl/src/CVS: Template