From 60fb707203c5b0ce2c32776890611846f0c22566 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Fri, 13 May 2016 23:55:33 +0100
Subject: configure: statically link sdl on win32 cross compile

Change-Id: If9115da0470e2c301589329af67433f7260d24d3
---
 tools/configure       |  4 ++--
 tools/release/sims.pl | 11 -----------
 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`;
-- 
cgit v1.2.3