Add libffi build scripts and patch for borked mozilla-build script

This commit is contained in:
Berke Viktor 2012-09-30 18:04:45 +02:00
parent 5873bf9e5d
commit b451ebc94f
5 changed files with 96 additions and 0 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -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%"=="" (