summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2016-05-13 23:55:33 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2016-05-13 23:55:33 +0100
commit60fb707203c5b0ce2c32776890611846f0c22566 (patch)
tree000158568f4a7037b6eca4248097743fd07ea51e
parentd405026ca8bc4c63d8fcd5d63cef02341182774b (diff)
downloadrockbox-60fb707.tar.gz
rockbox-60fb707.tar.bz2
rockbox-60fb707.zip
configure: statically link sdl on win32 cross compile
Change-Id: If9115da0470e2c301589329af67433f7260d24d3
-rwxr-xr-xtools/configure4
-rwxr-xr-xtools/release/sims.pl11
2 files changed, 2 insertions, 13 deletions
diff --git a/tools/configure b/tools/configure
index efad8a7c46..0c040455ae 100755
--- a/tools/configure
+++ b/tools/configure
@@ -255,7 +255,7 @@ simcc () {
if [ "$win32crosscompile" = "yes" ]; then
# We are crosscompiling
# add cross-compiler option(s)
- LDOPTS="$LDOPTS -mconsole"
+ LDOPTS="$LDOPTS -mconsole -static"
output="$output.exe"
winbuild="yes"
CROSS_COMPILE=${CROSS_COMPILE:-"i586-mingw32msvc-"}
@@ -342,7 +342,7 @@ simcc () {
else
# generic sdl-config checker
GCCOPTS="$GCCOPTS `$sdl --cflags`"
- LDOPTS="$LDOPTS `$sdl --libs`"
+ LDOPTS="$LDOPTS `$sdl --static-libs`"
fi
fi
diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index 1a6edb3ea1..d5cef51c67 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -148,22 +148,11 @@ sub runone {
print "Zip up the sim and associated files\n" if ($verbose);
mkpath(dirname($newo));
system("mv build-$dir $newo");
- if ($cross) {
- print "Find and copy SDL.dll\n" if ($verbose);
- 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));
$cmd = "zip -9 -r -q \"".basename($newo)."\" "
. "\"".basename($newo)."\"/rockboxui* "
. "\"".basename($newo)."\"/UI256.bmp "
- . "\"".basename($newo)."\"/SDL.dll "
. "\"".basename($newo)."\"/simdisk ";
print("$cmd\n") if($verbose);
`$cmd`;