From 807eccc2be7de2b8a4d0a49135ed20f0e265ceea Mon Sep 17 00:00:00 2001 From: gruntster Date: Sat, 8 Sep 2012 06:29:43 +0000 Subject: [PATCH] [mswin] update build scripts git-svn-id: svn://svn.berlios.de/avidemux/branches/avidemux_2.6_branch_mean@8180 30592fff-cfd4-0310-bf0e-8235a3c7be26 --- .../Set Common Environment Variables.bat | 14 +++---- .../mswin/avidemux/Package Notes.xml | 38 +++++++++++++++++++ .../mswin/fontconfig/Perform Build.bat | 2 +- foreignBuilds/mswin/nspr/Perform Build.bat | 2 +- foreignBuilds/mswin/qt/qmake32.conf.patch | 22 +---------- foreignBuilds/mswin/qt/qmake64.conf.patch | 22 ++++++++++- 6 files changed, 69 insertions(+), 31 deletions(-) diff --git a/foreignBuilds/mswin/Set Common Environment Variables.bat b/foreignBuilds/mswin/Set Common Environment Variables.bat index 25e53f2c72..2ddb486805 100644 --- a/foreignBuilds/mswin/Set Common Environment Variables.bat +++ b/foreignBuilds/mswin/Set Common Environment Variables.bat @@ -12,10 +12,10 @@ echo Error - BuildBits variable not set goto error :setVars -set mingwDir=%devDir%/MinGW64 +set mingwDir=%devDir%/mingw set usrLocalDir=%msysDir%/local%BuildBits% set qtDir=%devDir%/Qt%BuildBits% -set CMAKE_INCLUDE_PATH=%usrLocalDir%/include;%mingwDir%/x86_64-w64-mingw32/include;%mingwDir%/include +set CMAKE_INCLUDE_PATH=%usrLocalDir%/include;%mingwDir%/i686-w64-mingw32/include;%mingwDir%/include set CMAKE_LIBRARY_PATH=%usrLocalDir%/lib set PKG_CONFIG_PATH=%usrLocalDir%\lib\pkgconfig set SDLDIR=%usrLocalDir% @@ -32,10 +32,10 @@ if "%Debug%" EQU "1" ( set admSdkBuildDir=%devDir%\avidemux_2.6_build%BuildBits%_sdk ) -if "%BuildBits%" == "32" ( - set CFLAGS=%CFLAGS% -m32 - set CXXFLAGS=%CXXFLAGS% -m32 - set LDFLAGS=%LDFLAGS% -m32 +if "%BuildBits%" == "64" ( + set CFLAGS=%CFLAGS% -m64 + set CXXFLAGS=%CXXFLAGS% -m64 + set LDFLAGS=%LDFLAGS% -m64 ) if exist "%qtDir%" ( @@ -72,7 +72,7 @@ if not exist "%nsisDir%" ( set PATH=%cmakeDir%;%mingwDir%\bin;%usrLocalDir%\bin;%msysDir%\local-shared\bin;%qtDir%\bin;%devDir%\strawberry\perl\bin;%PATH% -if "%BuildBits%" == "32" set PATH=%mingwDir%\x86_64-w64-mingw32\lib32;%PATH% +if "%BuildBits%" == "64" set PATH=%mingwDir%\i686-w64-mingw32\lib64;%PATH% goto end diff --git a/foreignBuilds/mswin/avidemux/Package Notes.xml b/foreignBuilds/mswin/avidemux/Package Notes.xml index 01768f7c71..d1be4b35bd 100644 --- a/foreignBuilds/mswin/avidemux/Package Notes.xml +++ b/foreignBuilds/mswin/avidemux/Package Notes.xml @@ -1,5 +1,43 @@ + + + + + Updated NSPR to version 4.9.2. + + + + + Updated Fontconfig to version 2.10.1. + + + + Updated Fontconfig to version 2.10.0. + Updated x264 to r2208. + + + + + + + + Compiled with GCC 4.7.1. + Updated Fontconfig to version 2.9.92. + Updated Freetype to version 2.4.10. + Updated SQLite to version 3.7.13. + + + + Compiled with GCC 4.7.0. + Updated Aften to git version 89aee3d496bb2a89f046025402626ee12a12969f. + Updated Expat to version 2.1.0. + Updated Fontconfig to version 2.9.0. + Updated Freetype to version 2.4.9. + Updated NSPR to version 4.9.1. + Updated TwoLAME to version 0.3.13. + Updated zlib to version 1.2.7. + Updated Qt to version 4.8.2. diff --git a/foreignBuilds/mswin/fontconfig/Perform Build.bat b/foreignBuilds/mswin/fontconfig/Perform Build.bat index 70939bc407..feb0550296 100644 --- a/foreignBuilds/mswin/fontconfig/Perform Build.bat +++ b/foreignBuilds/mswin/fontconfig/Perform Build.bat @@ -17,7 +17,7 @@ verify >nul call "../Set Common Environment Variables" if errorlevel 1 goto end -set version=2.9.92 +set version=2.10.1 set package=fontconfig-%version%.tar.gz set sourceFolder=fontconfig-%version%-%BuildBits% set tarFolder=fontconfig-%version% diff --git a/foreignBuilds/mswin/nspr/Perform Build.bat b/foreignBuilds/mswin/nspr/Perform Build.bat index cf2c401cb6..a1908061b1 100644 --- a/foreignBuilds/mswin/nspr/Perform Build.bat +++ b/foreignBuilds/mswin/nspr/Perform Build.bat @@ -20,7 +20,7 @@ verify >nul call "../Set Common Environment Variables" if errorlevel 1 goto end -set version=4.9.1 +set version=4.9.2 set package=nspr-%version%.tar.gz set sourceFolder=nspr-%version%-%BuildBits% set tarFolder=nspr-%version% diff --git a/foreignBuilds/mswin/qt/qmake32.conf.patch b/foreignBuilds/mswin/qt/qmake32.conf.patch index 2e16fe3dfb..8c0066bcae 100644 --- a/foreignBuilds/mswin/qt/qmake32.conf.patch +++ b/foreignBuilds/mswin/qt/qmake32.conf.patch @@ -1,29 +1,11 @@ --- mkspecs/win32-g++/qmake.conf.bak 2012-03-15 01:01:12 +1100 -+++ mkspecs/win32-g++/qmake.conf 2012-03-30 10:08:56 +1100 -@@ -19,7 +19,7 @@ - QMAKE_LEXFLAGS = - QMAKE_YACC = byacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -+QMAKE_CFLAGS = -m32 - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall - QMAKE_CFLAGS_WARN_OFF = -w ++++ mkspecs/win32-g++/qmake.conf 2012-03-30 10:11:39 +1100 @@ -52,7 +52,7 @@ QMAKE_LINK = g++ QMAKE_LINK_C = gcc -QMAKE_LFLAGS = -+QMAKE_LFLAGS = -m32 -shared-libgcc ++QMAKE_LFLAGS = -shared-libgcc QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads QMAKE_LFLAGS_EXCEPTIONS_OFF = QMAKE_LFLAGS_RELEASE = -Wl,-s -@@ -102,7 +102,7 @@ - - QMAKE_IDL = midl - QMAKE_LIB = ar -ru --QMAKE_RC = windres -+QMAKE_RC = windres -F pe-i386 - QMAKE_ZIP = zip -r -9 - - QMAKE_STRIP = strip diff --git a/foreignBuilds/mswin/qt/qmake64.conf.patch b/foreignBuilds/mswin/qt/qmake64.conf.patch index 8c0066bcae..093a6a586a 100644 --- a/foreignBuilds/mswin/qt/qmake64.conf.patch +++ b/foreignBuilds/mswin/qt/qmake64.conf.patch @@ -1,11 +1,29 @@ --- mkspecs/win32-g++/qmake.conf.bak 2012-03-15 01:01:12 +1100 -+++ mkspecs/win32-g++/qmake.conf 2012-03-30 10:11:39 +1100 ++++ mkspecs/win32-g++/qmake.conf 2012-03-30 10:08:56 +1100 +@@ -19,7 +19,7 @@ + QMAKE_LEXFLAGS = + QMAKE_YACC = byacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = ++QMAKE_CFLAGS = -m64 + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall + QMAKE_CFLAGS_WARN_OFF = -w @@ -52,7 +52,7 @@ QMAKE_LINK = g++ QMAKE_LINK_C = gcc -QMAKE_LFLAGS = -+QMAKE_LFLAGS = -shared-libgcc ++QMAKE_LFLAGS = -m64 -shared-libgcc QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads QMAKE_LFLAGS_EXCEPTIONS_OFF = QMAKE_LFLAGS_RELEASE = -Wl,-s +@@ -102,7 +102,7 @@ + + QMAKE_IDL = midl + QMAKE_LIB = ar -ru +-QMAKE_RC = windres ++QMAKE_RC = windres -F pe-x86-64 + QMAKE_ZIP = zip -r -9 + + QMAKE_STRIP = strip