From 6734a958c1c64e8982e8a1b95dd4cc254f80e112 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@google.com>
Date: Wed, 11 Jun 2014 17:17:50 -0700
Subject: move to prebuilt mingw32.

Change-Id: I0bfc8be25c5da58659379657f42794b611373f7d
---
 emulator/mksdcard/build.gradle | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle
index 1ea266d..53872a3 100644
--- a/emulator/mksdcard/build.gradle
+++ b/emulator/mksdcard/build.gradle
@@ -35,15 +35,15 @@ model {
     toolChains {
         host(Clang)
         mingw(Gcc) {
-//            path "$project.rootDir/../prebuilts/gcc/linux-x86/host/i586-mingw32msvc-4.8/bin"
+            path "$project.rootDir/../prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/bin"
 
-            addPlatformConfiguration(new MingwOnLinuxConfiguration(project))
+            addPlatformConfiguration(new MingwOnLinuxConfiguration())
 
-            getCCompiler().executable =         'i586-mingw32msvc-gcc'
-            getCppCompiler().executable =       'i586-mingw32msvc-g++'
-            getLinker().executable =            'i586-mingw32msvc-gcc'
-            getAssembler().executable =         'i586-mingw32msvc-as'
-            getStaticLibArchiver().executable = 'i586-mingw32msvc-ar'
+            getCCompiler().executable =         'x86_64-w64-mingw32-gcc'
+            getCppCompiler().executable =       'x86_64-w64-mingw32-g++'
+            getLinker().executable =            'x86_64-w64-mingw32-gcc'
+            getAssembler().executable =         'x86_64-w64-mingw32-as'
+            getStaticLibArchiver().executable = 'x86_64-w64-mingw32-ar'
         }
     }
 }
@@ -78,11 +78,6 @@ def getExeName(String platform) {
 
 class MingwOnLinuxConfiguration implements TargetPlatformConfiguration {
 
-    Project project
-
-    MingwOnLinuxConfiguration(Project project) {
-        this.project = project
-    }
     boolean supportsPlatform(Platform element) {
         return element.getOperatingSystem().name == "windows"
     }
@@ -92,7 +87,7 @@ class MingwOnLinuxConfiguration implements TargetPlatformConfiguration {
     }
 
     List<String> getCCompilerArgs() {
-        ['-DUSE_MINGW', '-D__STDC_FORMAT_MACROS', '-D__STDC_CONSTANT_MACROS', '-D__USE_MINGW_ANSI_STDIO']
+        ['-DUSE_MINGW', '-D__STDC_FORMAT_MACROS', '-D__STDC_CONSTANT_MACROS', '-D__USE_MINGW_ANSI_STDIO', '-m32']
     }
 
     List<String> getObjectiveCCompilerArgs() {
@@ -108,7 +103,7 @@ class MingwOnLinuxConfiguration implements TargetPlatformConfiguration {
     }
 
     List<String> getLinkerArgs() {
-        ['-enable-stdcall-fixup']
+        ['-m32']
     }
 
     List<String> getStaticLibraryArchiverArgs() {
-- 
cgit v1.1