5 files changed, 69 insertions, 24 deletions

diff --git a/tools/builds.pm b/tools/builds.pm
index 518fb01e49..75d34dc079 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -10,6 +10,7 @@ $releasenotes="/wiki/ReleaseNotes315";
 # 'modelname' => {
 #    name => 'Full Name',
 #    status => 1,                        # 0=retired, 1=unusable, 2=unstable, 3=stable
+#    sim = 1,                            # optional (defaults 1 for status 2/3 and 0 for status 1)
 #    ram => 2,                           # optional (used?)
 #    manual => 'modelname2',             # optional (uses modelname2's manual)
 #    icon => 'modelname3',               # optional (uses modelname3's icon)
@@ -82,26 +83,32 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'hifietma9' => {
         name => 'HiFi E.T MA9',
+        sim => 0,
         status => 2,
     },
     'hifietma9c' => {
         name => 'HiFi E.T MA9C',
+        sim => 0,
         status => 2,
     },
     'hifietma8' => {
         name => 'HiFi E.T MA8',
         status => 2,
+        sim => 0,
     },
     'hifietma8c' => {
         name => 'HiFi E.T MA8C',
         status => 2,
+        sim => 0,
     },
     'hifimanhm60x' => {
         name => 'HiFiMAN HM-60x',
+        sim => 0,
         status => 2,
     },
     'hifimanhm801' => {
         name => 'HiFiMAN HM-801',
+        sim => 0,
         status => 2,
     },
     'iaudiom3' => {
@@ -118,10 +125,12 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'ibassodx50' => {
         name => 'iBasso DX50',
+        sim => 0,
         status => 2,
     },
     'ibassodx90' => {
         name => 'iBasso DX90',
+        sim => 0,
         status => 2,
     },
     'ipod1g2g' => {
@@ -219,10 +228,12 @@ $releasenotes="/wiki/ReleaseNotes315";
     'ondavx747' => {
         name => 'Onda VX747',
         status => 1,
+        sim => 1,
     },
     'ondavx747p' => {
         name => 'Onda VX747+',
         status => 1,
+        sim => 1,
     },
     'ondavx767' => {
         name => 'Onda VX767',
@@ -231,6 +242,7 @@ $releasenotes="/wiki/ReleaseNotes315";
     'ondavx777' => {
         name => 'Onda VX777',
         status => 1,
+        sim => 1,
     },
     'rk27generic' => {
         name => 'Rockchip rk27xx',
@@ -254,6 +266,7 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'samsungypr1' => {
         name => 'Samsung YP-R1',
+        sim => 0,
         status => 2,
     },
     'samsungyps3' => {
@@ -316,6 +329,7 @@ $releasenotes="/wiki/ReleaseNotes315";
     'sansam200v4' => {
         name => 'SanDisk Sansa m200 v4',
         status => 1,
+        sim => 1,
     },
     'sansaview' => {
         name => 'SanDisk Sansa View',
@@ -328,14 +342,17 @@ $releasenotes="/wiki/ReleaseNotes315";
     'zenvision' => {
         name => 'Creative Zen Vision',
         status => 1,
+        sim => 1,
     },
     'zenvisionm30gb' => {
         name => 'Creative Zen Vision:M 30GB',
         status => 1,
+        sim => 1,
     },
     'zenvisionm60gb' => {
         name => 'Creative Zen Vision:M 60GB',
         status => 1,
+        sim => 1,
     },
     'mpiohd200' => {
         name => 'MPIO HD200',
@@ -355,6 +372,7 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'sonynwze350' => {
         name => 'Sony NWZ-E350',
+        sim => 0,
         status => 2,
     },
     'sonynwze360' => {
@@ -367,26 +385,32 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'sonynwze450' => {
         name => 'Sony NWZ-E450',
+        sim => 0,
         status => 2,
     },
     'sonynwze460' => {
         name => 'Sony NWZ-E460',
+        sim => 0,
         status => 2,
     },
     'sonynwze470' => {
         name => 'Sony NWZ-E470',
+        sim => 0,
         status => 2,
     },
     'sonynwze580' => {
         name => 'Sony NWZ-E580',
+        sim => 0,
         status => 2,
     },
     'sonynwza10' => {
         name => 'Sony NWZ-A10',
+        sim => 0,
         status => 2,
     },
     'sonynwa20' => {
         name => 'Sony NW-A20',
+        sim => 0,
         status => 2,
     },
     'sonynwza860' => {
@@ -396,6 +420,7 @@ $releasenotes="/wiki/ReleaseNotes315";
     'sonynwzs750' => {
         name => 'Sony NWZ-S750',
         status => 2,
+        sim => 0,
     },
     'creativezenxfi' => {
         name => 'Creative Zen X-Fi',
@@ -512,6 +537,17 @@ sub allbuilds {
     return @list;
 }
 
+sub simbuilds {
+    my @list;
+
+    for my $b (&allbuilds) {
+        push @list, $b if (defined($builds{$b}{sim}) and $builds{$b}{sim});
+        push @list, $b if (!defined($builds{$b}{sim}) and $builds{$b}{status} > 1);
+    }
+
+    return @list;
+}
+
 ################################################################
 
 # 'voicename' => {
diff --git a/tools/configure b/tools/configure
index 43f02f5643..04699cb3e4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -311,6 +311,8 @@ simcc () {
    # add cross-compiler option(s)
    GCCOPTS="$GCCOPTS -Wno-format"
    LDOPTS="$LDOPTS -mconsole -static"
+   GLOBAL_LDOPTS=`echo $GLOBAL_LDOPTS | sed -e s/\-Wl,-z,defs//`
+   LDOPTS=`echo $LDOPTS | sed -e s/-ldl// -e s/-lrt// -e s/-lasound//`
    output="$output.exe"
    winbuild="yes"
 
@@ -433,6 +435,9 @@ simcc () {
         else
           echo "Your sdl-config does not know about static libs, falling back to shared library"
           sdlldopts=$($sdl --libs)
+#          if [ "$win32crosscompile" = "yes" ] ; then
+              LDOPTS=`echo $LDOPTS | sed -e s/-static//`
+#          fi
         fi
         GCCOPTS="$GCCOPTS ${sdlccopts}"
         LDOPTS="$LDOPTS ${sdlldopts}"
@@ -4733,7 +4738,7 @@ cmdline=`echo $cmdline | sed -e s,--target=[a-zA-Z_0-9]\*,,g \
                             -e s,--ram=[0-9]\*,,g \
                             -e s,--rbdir=[./a-zA-Z0-9]\*,,g \
                             -e s,--voice=[-_./a-zA-Z0-9]\*,,g \
-                            -e s,--type=[a-zA-Z]\*,,g`
+                            -e s,--type=[a-zA-Z0-9]\*,,g`
 cmdline="$cmdline --target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts"
 
 ### end of cmdline
diff --git a/tools/list_targets.pl b/tools/list_targets.pl
index 039c14f0db..9785bb5f22 100755
--- a/tools/list_targets.pl
+++ b/tools/list_targets.pl
@@ -10,18 +10,29 @@
 
 require "./builds.pm";
 
+print "Retired:\n";
+
+for my $b (&stablebuilds) {
+    print "   " , $builds{$b}{name} , "\n" if($builds{$b}{status} == 0);
+}
+
 print "Stable:\n";
 
 for my $b (&stablebuilds) {
-    print $builds{$b}{name} , "\n";
+    print "   " , $builds{$b}{name} , "\n" if($builds{$b}{status} != 0);
 }
 
 print "Unstable:\n";
 for my $b (&usablebuilds) {
-    print $builds{$b}{name} , "\n";
+    print "   " , $builds{$b}{name} , "\n";
 }
 
 print "Unusable:\n";
 for my $b (&allbuilds) {
-        print $builds{$b}{name} , "\n" if($builds{$b}{status} == 1);
+    print "   " , $builds{$b}{name} , "\n" if($builds{$b}{status} == 1);
+}
+
+print "Simulators:\n";
+for my $b (&simbuilds) {
+    print "   " , $builds{$b}{name} , "\n";
 }
diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index 2cf5c4f45a..10cf950c53 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -188,26 +188,14 @@ sub buildit {
     `make install 2>/dev/null`;
 }
 
-for my $b (sort byname keys %builds) {
-    if ($builds{$b}{status} > 0 && $builds{$b}{status} >= 2)
+for my $b (sort &simbuilds) {
+    if ($builds{$b}{ram} ne '')
     {
-        if ($builds{$b}{ram} ne '')
-        {
-            # These builds need the ram size sent to configure
-            runone($b, $builds{$b}{ram} . '\n');
-        }
-        else
-        {
-            runone($b);
-        }
+        # These builds need the ram size sent to configure
+        runone($b, $builds{$b}{ram} . '\n');
+    }
+    else
+    {
+        runone($b);
     }
 }
-
-#The following ports are in the unusable category, but the simulator does build
-runone("ondavx747");
-runone("ondavx747p");
-runone("ondavx777");
-runone("sansam200v4");
-runone("zenvision");
-runone("zenvisionm30gb");
-runone("zenvisionm60gb");
diff --git a/tools/xduoox3-updatebl.sh b/tools/xduoox3-updatebl.sh
new file mode 100755
index 0000000000..efb52bff8c
--- /dev/null
+++ b/tools/xduoox3-updatebl.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+unzip $1 rockbox.bin
+dd if=bootloader-x3.bin of=rockbox.bin bs=2048 seek=4 conv=nocreat conv=notrunc
+zip -o $1 rockbox.bin rockbox-info.txt
+rm rockbox.bin