Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

configure: statically link sdl on win32 cross compile

Browse source 
Change-Id: If9115da0470e2c301589329af67433f7260d24d3
This commit is contained in:
Amaury Pouly 2016-05-13 23:55:33 +01:00
parent d405026ca8
commit 60fb707203
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/configure vendored
View file

@ -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

11
tools/release/sims.pl
View file

@ -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`;