Skip to content

Commit

Permalink
[mswin] update build scripts
Browse files Browse the repository at this point in the history 
git-svn-id: svn://svn.berlios.de/avidemux/branches/avidemux_2.6_branch_mean@8180 30592fff-cfd4-0310-bf0e-8235a3c7be26
  • Loading branch information
gruntster committed Sep 8, 2012
1 parent f8c1287 commit 807eccc
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 31 deletions.
14 changes: 7 additions & 7 deletions foreignBuilds/mswin/Set Common Environment Variables.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -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%" (
Expand Down Expand Up @@ -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

Expand Down
38 changes: 38 additions & 0 deletions foreignBuilds/mswin/avidemux/Package Notes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,43 @@
<?xml version="1.0"?>
<log>
<buildentry revision="8179 [2.6.0 Final]" date="2012-09-08" />
<buildentry revision="8171" date="2012-09-03" />
<buildentry revision="8164" date="2012-08-26" />
<buildentry revision="8142" date="2012-08-21">
<comment>Updated NSPR to version 4.9.2.</comment>
</buildentry>
<buildentry revision="8121" date="2012-08-05" />
<buildentry revision="8121" date="2012-08-05" />
<buildentry revision="8108" date="2012-08-01">
<comment>Updated Fontconfig to version 2.10.1.</comment>
</buildentry>
<buildentry revision="8097" date="2012-07-25" />
<buildentry revision="8080" date="2012-07-19">
<comment>Updated Fontconfig to version 2.10.0.</comment>
<comment>Updated x264 to r2208.</comment>
</buildentry>
<buildentry revision="8071" date="2012-07-16" />
<buildentry revision="8054" date="2012-07-13" />
<buildentry revision="8048" date="2012-07-10" />
<buildentry revision="8044" date="2012-07-07" />
<buildentry revision="8039" date="2012-07-04" />
<buildentry revision="8027" date="2012-06-25">
<comment>Compiled with GCC 4.7.1.</comment>
<comment>Updated Fontconfig to version 2.9.92.</comment>
<comment>Updated Freetype to version 2.4.10.</comment>
<comment>Updated SQLite to version 3.7.13.</comment>
</buildentry>
<buildentry revision="8020" date="2012-06-11" />
<buildentry revision="8005" date="2012-06-09">
<comment>Compiled with GCC 4.7.0.</comment>
<comment>Updated Aften to git version 89aee3d496bb2a89f046025402626ee12a12969f.</comment>
<comment>Updated Expat to version 2.1.0.</comment>
<comment>Updated Fontconfig to version 2.9.0.</comment>
<comment>Updated Freetype to version 2.4.9.</comment>
<comment>Updated NSPR to version 4.9.1.</comment>
<comment>Updated TwoLAME to version 0.3.13.</comment>
<comment>Updated zlib to version 1.2.7.</comment>
</buildentry>
<buildentry revision="7990" date="2012-05-30" />
<buildentry revision="7984" date="2012-05-24">
<comment>Updated Qt to version 4.8.2.</comment>
Expand Down
2 changes: 1 addition & 1 deletion foreignBuilds/mswin/fontconfig/Perform Build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion foreignBuilds/mswin/nspr/Perform Build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
22 changes: 2 additions & 20 deletions foreignBuilds/mswin/qt/qmake32.conf.patch
View file
Original file line number Diff line number Diff line change
@@ -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
22 changes: 20 additions & 2 deletions foreignBuilds/mswin/qt/qmake64.conf.patch
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 807eccc

Please sign in to comment.