summaryrefslogtreecommitdiffstats
path: root/tools/release/sims.pl
diff options
context:
space:
mode:
authorJonas Häggqvist <rasher@rasher.dk>2009-10-27 23:24:04 +0000
committerJonas Häggqvist <rasher@rasher.dk>2009-10-27 23:24:04 +0000
commit35ee2fdd45490f32cea5795014cb265ec75ef7c6 (patch)
treee1fd64b2d04fc2ecf777714764e359f046f5352f /tools/release/sims.pl
parent06027214c8ffe7e2be0fb81742b1c8478ad91f38 (diff)
downloadrockbox-35ee2fdd45490f32cea5795014cb265ec75ef7c6.tar.gz
rockbox-35ee2fdd45490f32cea5795014cb265ec75ef7c6.tar.bz2
rockbox-35ee2fdd45490f32cea5795014cb265ec75ef7c6.zip
Copy SDL.dll from the SDL dir which was used, rather than relying on PATH.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23374 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/release/sims.pl')
-rwxr-xr-xtools/release/sims.pl11
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index a837b00c1c..6093ebe5d1 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -117,6 +117,7 @@ sub runone {
$cmd = "find \\( -name 'rockboxui*' -o -iname '*dll' -o -name '*.rock' -o -name '*.codec' \\) -exec $striptool '{}' ';'";
print("$cmd\n") if ($verbose);
`$cmd`;
+ close(MAKE);
}
chdir "..";
@@ -135,9 +136,15 @@ sub runone {
print "Zip up the sim and associated files\n" if ($verbose);
mkpath(dirname($newo));
system("mv build-$dir $newo");
- if (-f "$newo/rockboxui.exe") {
+ if ($cross) {
print "Find and copy SDL.dll\n" if ($verbose);
- `cp \`dirname \\\`which sdl-config\\\`\`/SDL.dll ./$newo/`;
+ open(MAKE, "$newo/Makefile");
+ my $GCCOPTS=(grep(/^export GCCOPTS=/, <MAKE>))[0];
+ chomp($GCCOPTS);
+ (my $sdldll = $GCCOPTS) =~ s/^export GCCOPTS=.*-I([^ ]+)\/include\/SDL.*$/$1\/bin\/SDL.dll/;
+ print "Found $sdldll\n" if ($verbose);
+ `cp $sdldll ./$newo/`;
+ close(MAKE);
}
my $toplevel = getcwd();
chdir(dirname($newo));