From b451ebc94f49647413881d8ec3806fd699f7a3f9 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sun, 30 Sep 2012 18:04:45 +0200
Subject: [PATCH] Add libffi build scripts and patch for borked mozilla-build
 script

---
 win32/deps/libffi/build-x64.bat   |  6 ++++++
 win32/deps/libffi/build-x86.bat   |  6 ++++++
 win32/deps/libffi/release-x64.bat | 32 +++++++++++++++++++++++++++++++
 win32/deps/libffi/release-x86.bat | 32 +++++++++++++++++++++++++++++++
 win32/deps/mozilla-build.patch    | 20 +++++++++++++++++++
 5 files changed, 96 insertions(+)
 create mode 100644 win32/deps/libffi/build-x64.bat
 create mode 100644 win32/deps/libffi/build-x86.bat
 create mode 100644 win32/deps/libffi/release-x64.bat
 create mode 100644 win32/deps/libffi/release-x86.bat
 create mode 100644 win32/deps/mozilla-build.patch

diff --git a/win32/deps/libffi/build-x64.bat b/win32/deps/libffi/build-x64.bat
new file mode 100644
index 00000000..d0a6f8cc
--- /dev/null
+++ b/win32/deps/libffi/build-x64.bat
@@ -0,0 +1,6 @@
+#run this from mozilla-build\start-msvc11-x64.bat
+#cd /c/mozilla-build/hexchat/libffi-3.0.11
+
+./configure CC="$(pwd)/msvcc.sh -m64" LD=link CPP='cl -nologo -EP' CFLAGS='-O2' --build=x86_64-w64-mingw32
+make clean
+make
diff --git a/win32/deps/libffi/build-x86.bat b/win32/deps/libffi/build-x86.bat
new file mode 100644
index 00000000..f750d615
--- /dev/null
+++ b/win32/deps/libffi/build-x86.bat
@@ -0,0 +1,6 @@
+#run this from mozilla-build\start-msvc11.bat
+#cd /c/mozilla-build/hexchat/libffi-3.0.11
+
+./configure CC=$(pwd)/msvcc.sh LD=link CPP='cl -nologo -EP' CFLAGS='-O2' --build=i686-pc-mingw32
+make clean
+make
diff --git a/win32/deps/libffi/release-x64.bat b/win32/deps/libffi/release-x64.bat
new file mode 100644
index 00000000..2b556375
--- /dev/null
+++ b/win32/deps/libffi/release-x64.bat
@@ -0,0 +1,32 @@
+:: run this from a command prompt
+@echo off
+
+SET PACKAGE_NAME=libffi-3.0.11
+
+set LIBFFI_SRC=%cd%
+set LIBFFI_DEST=%cd%-x64
+echo.Press return when ready to install!
+pause
+
+rmdir /q /s %LIBFFI_DEST%
+mkdir %LIBFFI_DEST%
+mkdir %LIBFFI_DEST%\bin
+mkdir %LIBFFI_DEST%\include
+mkdir %LIBFFI_DEST%\lib
+set OUTDIR=x86_64-w64-mingw32
+copy %OUTDIR%\include\ffi.h %LIBFFI_DEST%\include
+copy %OUTDIR%\include\ffitarget.h %LIBFFI_DEST%\include
+copy %OUTDIR%\.libs\libffi_convenience.lib %LIBFFI_DEST%\lib\libffi.lib
+copy %OUTDIR%\.libs\libffi-6.dll %LIBFFI_DEST%\bin
+copy LICENSE %LIBFFI_DEST%\LICENSE.LIBFFI
+
+cd %LIBFFI_DEST%
+set PATH=%PATH%;%ProgramFiles%\7-zip
+del ..\%PACKAGE_NAME%-x64.7z
+7z a ..\%PACKAGE_NAME%-x64.7z *
+cd %LIBFFI_SRC%
+rmdir /q /s %LIBFFI_DEST%
+rmdir /q /s %OUTDIR%
+
+echo.Finished!
+pause
diff --git a/win32/deps/libffi/release-x86.bat b/win32/deps/libffi/release-x86.bat
new file mode 100644
index 00000000..1313cc12
--- /dev/null
+++ b/win32/deps/libffi/release-x86.bat
@@ -0,0 +1,32 @@
+:: run this from a command prompt
+@echo off
+
+SET PACKAGE_NAME=libffi-3.0.11
+
+set LIBFFI_SRC=%cd%
+set LIBFFI_DEST=%cd%-x86
+echo.Press return when ready to install!
+pause
+
+rmdir /q /s %LIBFFI_DEST%
+mkdir %LIBFFI_DEST%
+mkdir %LIBFFI_DEST%\bin
+mkdir %LIBFFI_DEST%\include
+mkdir %LIBFFI_DEST%\lib
+set OUTDIR=i686-pc-mingw32
+copy %OUTDIR%\include\ffi.h %LIBFFI_DEST%\include
+copy %OUTDIR%\include\ffitarget.h %LIBFFI_DEST%\include
+copy %OUTDIR%\.libs\libffi_convenience.lib %LIBFFI_DEST%\lib\libffi.lib
+copy %OUTDIR%\.libs\libffi-6.dll %LIBFFI_DEST%\bin
+copy LICENSE %LIBFFI_DEST%\LICENSE.LIBFFI
+
+cd %LIBFFI_DEST%
+set PATH=%PATH%;%ProgramFiles%\7-zip
+del ..\%PACKAGE_NAME%-x86.7z
+7z a ..\%PACKAGE_NAME%-x86.7z *
+cd %LIBFFI_SRC%
+rmdir /q /s %LIBFFI_DEST%
+rmdir /q /s %OUTDIR%
+
+echo.Finished!
+pause
diff --git a/win32/deps/mozilla-build.patch b/win32/deps/mozilla-build.patch
new file mode 100644
index 00000000..9f528212
--- /dev/null
+++ b/win32/deps/mozilla-build.patch
@@ -0,0 +1,20 @@
+--- start-msvc11-x64.bat.orig	2012-07-18 19:44:24 +0200
++++ start-msvc11-x64.bat	2012-09-30 17:48:59 +0200
+@@ -30,7 +30,7 @@
+     )
+ 
+     rem Prepend MSVC paths
+-    call "%VC11EXPRESSDIR%\bin\amd64\vcvars64.bat" 2>nul
++    call "%VC11EXPRESSDIR%\bin\x86_amd64\vcvarsx86_amd64.bat" 2>nul
+     if "%DevEnvDir%"=="" (
+       rem Might be using a compiler that shipped with an SDK, so manually set paths
+       SET "PATH=%VC11EXPRESSDIR%\Bin\amd64;%VC11EXPRESSDIR%\Bin;%PATH%"
+@@ -58,7 +58,7 @@
+     rem Prepend MSVC paths
+     rem The Win7 SDK (or newer) should automatically integrate itself into vcvars32.bat
+     ECHO Using VC 2012 built-in SDK
+-    call "%VC11DIR%\bin\amd64\vcvars64.bat"
++    call "%VC11DIR%\bin\x86_amd64\vcvarsx86_amd64.bat"
+ )
+ 
+ if "%VC11DIR%"=="" (