From 8028010503def4a5fdf80ebd526a63e7ea2232f0 Mon Sep 17 00:00:00 2001 From: gruntster Date: Sat, 9 Jun 2012 02:25:27 +0000 Subject: [PATCH] [mswin] update build scripts git-svn-id: svn://svn.berlios.de/avidemux/branches/avidemux_2.6_branch_mean@8004 30592fff-cfd4-0310-bf0e-8235a3c7be26 --- avidemux/winInstaller/avidemux.nsi | 83 ++++++++----------- .../Set Common Environment Variables.bat | 30 +++---- foreignBuilds/mswin/aften/Perform Build.bat | 58 +++++++++++++ .../mswin/avsproxy/Perform Build.bat | 31 +++++++ foreignBuilds/mswin/expat/Perform Build.bat | 72 ++++++++++++++++ .../mswin/fontconfig/Perform Build.bat | 10 +-- .../mswin/freetype/Perform Build.bat | 73 ++++++++++++++++ foreignBuilds/mswin/nspr/Perform Build.bat | 12 ++- foreignBuilds/mswin/nspr/configure32.patch | 24 ------ foreignBuilds/mswin/nspr/configure64.patch | 11 --- foreignBuilds/mswin/qt/Perform Build.bat | 2 +- foreignBuilds/mswin/qt/qmake32.conf.patch | 2 +- foreignBuilds/mswin/qt/qmake64.conf.patch | 2 +- foreignBuilds/mswin/twolame/Perform Build.bat | 2 +- .../mswin/win-iconv/Perform Build.bat | 61 ++++++++++++++ foreignBuilds/mswin/zlib/Perform Build.bat | 69 +++++++++++++++ 16 files changed, 425 insertions(+), 117 deletions(-) create mode 100644 foreignBuilds/mswin/aften/Perform Build.bat create mode 100644 foreignBuilds/mswin/avsproxy/Perform Build.bat create mode 100644 foreignBuilds/mswin/expat/Perform Build.bat create mode 100644 foreignBuilds/mswin/freetype/Perform Build.bat delete mode 100644 foreignBuilds/mswin/nspr/configure32.patch delete mode 100644 foreignBuilds/mswin/nspr/configure64.patch create mode 100644 foreignBuilds/mswin/win-iconv/Perform Build.bat create mode 100644 foreignBuilds/mswin/zlib/Perform Build.bat diff --git a/avidemux/winInstaller/avidemux.nsi b/avidemux/winInstaller/avidemux.nsi index e6a59fd8a7..0b167bb15d 100644 --- a/avidemux/winInstaller/avidemux.nsi +++ b/avidemux/winInstaller/avidemux.nsi @@ -276,22 +276,12 @@ Section "Avidemux Core" SecCore SetOverwrite on ${File} "Build Info.txt" ${File} "Change Log.html" - ${File} zlib1.dll - -!if ${BUILD_BITS} == 32 - ${File} freetype6.dll - ${File} pthreadGC2-w32.dll + ${File} libexpat-1.dll + ${File} libfreetype-6.dll ${File} libgcc_s_sjlj-1.dll ${File} libstdc++-6.dll -!endif - -!if ${BUILD_BITS} == 64 - ${File} libfreetype-6.dll - ${File} pthreadGC2-w64.dll - ${File} libgcc_s_sjlj_64-1.dll - ${File} libstdc++_64-6.dll -!endif - + ${File} libwinpthread-1.dll + ${File} zlib1.dll ${File} nspr4.dll ${File} libjs.dll ${File} libADM_audioParser6.dll @@ -316,7 +306,6 @@ Section "Avidemux Core" SecCore ${File} libADM_coreVideoCodec6.dll ${File} libADM_coreVideoEncoder6.dll ${File} libADM_coreVideoFilter6.dll - ${File} libxml2-*.dll ${File} AUTHORS. ${File} COPYING. ${File} README. @@ -1121,38 +1110,38 @@ End: ${Folder} etc\fonts ${MementoSectionEnd} SectionGroupEnd - SectionGroup "OpenGL Filters" SecGrpVideoFilterOpenGl - ${MementoSection} "Fragment Shader" SecVidFltOpenGlFragmentShader - SectionIn 1 2 - SetOverwrite on - SetOutPath $INSTDIR\plugins\videoFilters - ${File} plugins\videoFilters\libADM_vf_sampleGlFrag2.dll - ${MementoSectionEnd} - ${MementoSection} "Read Back Benchmark" SecVidFltOpenGlReadBack - SectionIn 1 2 - SetOverwrite on - SetOutPath $INSTDIR\plugins\videoFilters - ${File} plugins\videoFilters\libADM_vf_glBenchmark.dll - ${MementoSectionEnd} - ${MementoSection} "Resize" SecVidFltOpenGlResize - SectionIn 1 2 - SetOverwrite on - SetOutPath $INSTDIR\plugins\videoFilters - ${File} plugins\videoFilters\libADM_vf_glResize.dll - ${MementoSectionEnd} - ${MementoSection} "Rotate" SecVidFltOpenGlRotate - SectionIn 1 2 - SetOverwrite on - SetOutPath $INSTDIR\plugins\videoFilters - ${File} plugins\videoFilters\libADM_vf_rotateGlFrag2.dll - ${MementoSectionEnd} - ${MementoSection} "Wave" SecVidFltOpenGlWave - SectionIn 1 2 - SetOverwrite on - SetOutPath $INSTDIR\plugins\videoFilters - ${File} plugins\videoFilters\libADM_vf_sampleGlVertex.dll - ${MementoSectionEnd} - SectionGroupEnd + #SectionGroup "OpenGL Filters" SecGrpVideoFilterOpenGl + #${MementoSection} "Fragment Shader" SecVidFltOpenGlFragmentShader + #SectionIn 1 2 + #SetOverwrite on + #SetOutPath $INSTDIR\plugins\videoFilters + #${File} plugins\videoFilters\libADM_vf_sampleGlFrag2.dll + #${MementoSectionEnd} + #${MementoSection} "Read Back Benchmark" SecVidFltOpenGlReadBack + #SectionIn 1 2 + #SetOverwrite on + #SetOutPath $INSTDIR\plugins\videoFilters + #${File} plugins\videoFilters\libADM_vf_glBenchmark.dll + #${MementoSectionEnd} + #${MementoSection} "Resize" SecVidFltOpenGlResize + #SectionIn 1 2 + #SetOverwrite on + #SetOutPath $INSTDIR\plugins\videoFilters + #${File} plugins\videoFilters\libADM_vf_glResize.dll + #${MementoSectionEnd} + #${MementoSection} "Rotate" SecVidFltOpenGlRotate + #SectionIn 1 2 + #SetOverwrite on + #SetOutPath $INSTDIR\plugins\videoFilters + #${File} plugins\videoFilters\libADM_vf_rotateGlFrag2.dll + #${MementoSectionEnd} + #${MementoSection} "Wave" SecVidFltOpenGlWave + #SectionIn 1 2 + #SetOverwrite on + #SetOutPath $INSTDIR\plugins\videoFilters + #${File} plugins\videoFilters\libADM_vf_sampleGlVertex.dll + #${MementoSectionEnd} + #SectionGroupEnd SectionGroup "Miscellaneous Filters" SecGrpVideoFilterMiscellaneous ${MementoSection} "Print Information" SecVidFltPrintInfo SectionIn 1 2 diff --git a/foreignBuilds/mswin/Set Common Environment Variables.bat b/foreignBuilds/mswin/Set Common Environment Variables.bat index 52feec9260..c31849b970 100644 --- a/foreignBuilds/mswin/Set Common Environment Variables.bat +++ b/foreignBuilds/mswin/Set Common Environment Variables.bat @@ -2,7 +2,7 @@ set ProgramFiles32=%ProgramFiles% if "%PROCESSOR_ARCHITECTURE%" == "AMD64" for /D %%d in ("%ProgramFiles(x86)%") do set ProgramFiles32=%%~fsd set nsisDir=%ProgramFiles32%\NSIS -set devDir=%~d0\Dev +set devDir=%~d0/Dev set msysDir=%~d0/Dev/MSYS if "%BuildBits%" == "32" goto :setVars @@ -12,16 +12,16 @@ echo Error - BuildBits variable not set goto error :setVars -set mingwDir=%devDir%\MinGW64 +set mingwDir=%devDir%/MinGW64 set usrLocalDir=%msysDir%/local%BuildBits% -set qtDir=%devDir%\Qt%BuildBits% -set CMAKE_INCLUDE_PATH=%usrLocalDir%/include +set qtDir=%devDir%/Qt%BuildBits% +set CMAKE_INCLUDE_PATH=%usrLocalDir%/include;%mingwDir%/x86_64-w64-mingw32/include set CMAKE_LIBRARY_PATH=%usrLocalDir%/lib set PKG_CONFIG_PATH=%usrLocalDir%\lib\pkgconfig set SDLDIR=%usrLocalDir% -set CFLAGS=%CFLAGS% -I%CMAKE_INCLUDE_PATH% -L%CMAKE_LIBRARY_PATH% -set CXXFLAGS=%CXXFLAGS% -I%CMAKE_INCLUDE_PATH% -L%CMAKE_LIBRARY_PATH% -set LDFLAGS=%LDFLAGS% -shared-libgcc -shared-libstdc++ -L%CMAKE_LIBRARY_PATH% +set CFLAGS=%CFLAGS% -I%CMAKE_INCLUDE_PATH:;= -I% -L%CMAKE_LIBRARY_PATH:;= -L% +set CXXFLAGS=%CXXFLAGS% -I%CMAKE_INCLUDE_PATH:;= -I% -L%CMAKE_LIBRARY_PATH:;= -L% +set LDFLAGS=%LDFLAGS% -shared-libgcc -L%CMAKE_LIBRARY_PATH:;= -L% if "%Debug%" EQU "1" ( set admBuildDir=%devDir%\avidemux_2.6_build%BuildBits%-dbg @@ -39,7 +39,7 @@ if "%BuildBits%" == "32" ( ) if exist "%qtDir%" ( - for /f %%d in ('dir /b /ad /on %qtDir%') do set qtVer=%%d + for /f %%d in ('dir /b /ad /on "%qtDir%"') do set qtVer=%%d ) else ( echo Qt 4 could not be found at "%qtDir%". Please download from http://www.trolltech.com goto error @@ -65,22 +65,14 @@ if not exist "%mingwDir%" ( goto error ) -if not exist "%CMAKE_INCLUDE_PATH%" ( - echo Include path could not be found at "%CMAKE_INCLUDE_PATH%". - goto error -) - -if not exist "%CMAKE_LIBRARY_PATH%" ( - echo Library path could not be found at "%CMAKE_LIBRARY_PATH%". - goto error -) - if not exist "%nsisDir%" ( echo NSIS could not be found at "%nsisDir%". Please download from http://nsis.sourceforge.net goto error ) -set PATH=%cmakeDir%;%mingwDir%\bin;%usrLocalDir%\bin;%msysDir%\local-shared\bin;%qtDir%\bin;c:\strawberry\perl\bin;%PATH% +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% goto end diff --git a/foreignBuilds/mswin/aften/Perform Build.bat b/foreignBuilds/mswin/aften/Perform Build.bat new file mode 100644 index 0000000000..f244be361e --- /dev/null +++ b/foreignBuilds/mswin/aften/Perform Build.bat @@ -0,0 +1,58 @@ +@echo off + +echo MSVC build for Aften +echo ==================== +echo 1. 32-bit build +echo 2. 64-bit build +echo X. Exit +echo. + +choice /c 12x + +if errorlevel 1 ( + set BuildBits=32 + set VcvarFlags=x86 ) +if errorlevel 2 ( + set BuildBits=64 + set VcvarFlags=x86_amd64 ) +if errorlevel 3 goto :eof + +verify >nul +call "../Set Common Environment Variables" +if errorlevel 1 goto end + +set curDir=%CD% +set PATH=%PATH%;%msysdir%\bin;%devDir%\Git\bin +set CFLAGS= +set CXXFLAGS= +set LDFLAGS= + +call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %VcvarFlags% +echo. + +set sourceFolder=%devDir%/aften-%BuildBits% +rm -r -f %sourceFolder% +if errorlevel 1 goto end + +echo Downloading from git +call git clone git://aften.git.sourceforge.net/gitroot/aften/aften %sourceFolder% +if errorlevel 1 goto end + +cd "%sourceFolder%" +call git checkout 89aee3d496bb2a89f046025402626ee12a12969f +if errorlevel 1 goto end + +mkdir build%BuildBits% +if errorlevel 1 goto end + +cd build%BuildBits% +cmake -G"NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%usrLocalDir% -DSHARED=ON -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" .. +if errorlevel 1 goto end + +nmake install +if errorlevel 1 goto end + +copy "%usrLocalDir%\bin\aften.dll" "%admBuildDir%" + +:end +pause \ No newline at end of file diff --git a/foreignBuilds/mswin/avsproxy/Perform Build.bat b/foreignBuilds/mswin/avsproxy/Perform Build.bat new file mode 100644 index 0000000000..a2c094cea6 --- /dev/null +++ b/foreignBuilds/mswin/avsproxy/Perform Build.bat @@ -0,0 +1,31 @@ +@echo off + +echo MSVC build for avsproxy +echo ======================= +echo. + +set curDir=%CD% + +call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +echo. + +cd ..\..\..\addons\avisynthproxy +if errorlevel 1 goto end + +vcupgrade -overwrite -nologo avsproxy.vcproj +if errorlevel 1 goto end + +echo. +msbuild avsproxy.vcxproj /p:Configuration=Release /t:rebuild +if errorlevel 1 goto end + +set BuildBits=32 +call "%curDir%\..\Set Common Environment Variables" +copy "avsproxy.exe" "%admBuildDir%" + +set BuildBits=64 +call "%curDir%\..\Set Common Environment Variables" +copy "avsproxy.exe" "%admBuildDir%" + +:end +pause \ No newline at end of file diff --git a/foreignBuilds/mswin/expat/Perform Build.bat b/foreignBuilds/mswin/expat/Perform Build.bat new file mode 100644 index 0000000000..439a6c63b4 --- /dev/null +++ b/foreignBuilds/mswin/expat/Perform Build.bat @@ -0,0 +1,72 @@ +@echo off + +echo MSYS build for expat +echo ==================== +echo 1. 32-bit build +echo 2. 64-bit build +echo X. Exit +echo. + +choice /c 12x + +if errorlevel 1 set BuildBits=32 +if errorlevel 2 set BuildBits=64 +if errorlevel 3 goto :eof + +verify >nul +call "../Set Common Environment Variables" +if errorlevel 1 goto end + +set version=2.1.0 +set package=expat-%version%.tar.gz +set sourceFolder=expat-%version%-%BuildBits% +set tarFolder=expat-%version% +set curDir=%CD% +set PATH=%PATH%;%msysDir%\bin + +if not exist %package% ( + echo. + echo Downloading + wget http://sourceforge.net/projects/expat/files/expat/%version%/%package%/download +) + +if errorlevel 1 goto end + +echo. +echo Preparing +rm -r -f "%devDir%\%sourceFolder%" +if errorlevel 1 goto end + +mkdir "%devDir%\%sourceFolder%" +if errorlevel 1 goto end + +tar xfz "%package%" -C "%devDir%\\%sourceFolder%" +if errorlevel 1 goto end +cd "%devDir%\%sourceFolder%" + +for /f "delims=" %%a in ('dir /b %tarFolder%') do ( + move "%CD%\%tarFolder%\%%a" "%CD%" +) + +echo. +echo Configuring + +sh ./configure --prefix="%usrLocalDir%" --disable-static + +if errorlevel 1 goto end +echo. +pause + +make CFLAGS="%CFLAGS% -O3" install +if errorlevel 1 goto end + +strip "%usrLocalDir%\bin\libexpat-1.dll" +copy "%usrLocalDir%\bin\libexpat-1.dll" "%admBuildDir%" + +goto end + +:error +echo Error + +:end +pause \ No newline at end of file diff --git a/foreignBuilds/mswin/fontconfig/Perform Build.bat b/foreignBuilds/mswin/fontconfig/Perform Build.bat index 13375390e2..e5df2d1ae8 100644 --- a/foreignBuilds/mswin/fontconfig/Perform Build.bat +++ b/foreignBuilds/mswin/fontconfig/Perform Build.bat @@ -17,9 +17,10 @@ verify >nul call "../Set Common Environment Variables" if errorlevel 1 goto end -set package=fontconfig-2.8.0.tar.gz -set sourceFolder=fontconfig-2.8.0-%BuildBits% -set tarFolder=fontconfig-2.8.0 +set version=2.9.0 +set package=fontconfig-%version%.tar.gz +set sourceFolder=fontconfig-%version%-%BuildBits% +set tarFolder=fontconfig-%version% set curDir=%CD% set PATH=%PATH%;%msysDir%\bin @@ -56,11 +57,10 @@ if errorlevel 1 goto end echo. pause -make install +make install-strip if errorlevel 1 goto end del "%usrLocalDir%\etc\fonts\fonts.conf.bak" -strip "%usrLocalDir%\bin\libfontconfig-1.dll" copy "%usrLocalDir%\bin\libfontconfig-1.dll" "%admBuildDir%" xcopy /s/y "%usrLocalDir%\etc\fonts\*.*" "%admBuildDir%\etc\fonts\" diff --git a/foreignBuilds/mswin/freetype/Perform Build.bat b/foreignBuilds/mswin/freetype/Perform Build.bat new file mode 100644 index 0000000000..0050ffef17 --- /dev/null +++ b/foreignBuilds/mswin/freetype/Perform Build.bat @@ -0,0 +1,73 @@ +@echo off + +echo MSYS build for FreeType +echo ======================= +echo 1. 32-bit build +echo 2. 64-bit build +echo X. Exit +echo. + +choice /c 12x + +if errorlevel 1 set BuildBits=32 +if errorlevel 2 set BuildBits=64 +if errorlevel 3 goto :eof + +verify >nul +call "../Set Common Environment Variables" +if errorlevel 1 goto end + +set version=2.4.9 +set package=freetype-%version%.tar.gz +set sourceFolder=freetype-%version%-%BuildBits% +set tarFolder=freetype-%version% +set curDir=%CD% +set PATH=%PATH%;%msysDir%\bin + +if not exist %package% ( + echo. + echo Downloading + wget http://sourceforge.net/projects/freetype/files/freetype2/%version%/%package%/download +) + +if errorlevel 1 goto end + +echo. +echo Preparing +rm -r -f "%devDir%\%sourceFolder%" +if errorlevel 1 goto end + +mkdir "%devDir%\%sourceFolder%" +if errorlevel 1 goto end + +tar xfz "%package%" -C "%devDir%\\%sourceFolder%" +if errorlevel 1 goto end +cd "%devDir%\%sourceFolder%" + +for /f "delims=" %%a in ('dir /b %tarFolder%') do ( + move "%CD%\%tarFolder%\%%a" "%CD%" +) + +echo. +echo Configuring + +set CFLAGS=%CFLAGS% -O3 +sh ./configure --prefix="%usrLocalDir%" --disable-static + +if errorlevel 1 goto end +echo. +pause + +make install +if errorlevel 1 goto end + +strip "%usrLocalDir%\bin\libfreetype-6.dll" +copy "%usrLocalDir%\bin\libfreetype-6.dll" "%admBuildDir%" + +goto end + +:error +echo Error + +:end +pause \ No newline at end of file diff --git a/foreignBuilds/mswin/nspr/Perform Build.bat b/foreignBuilds/mswin/nspr/Perform Build.bat index 7c68c86027..cf2c401cb6 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 +set version=4.9.1 set package=nspr-%version%.tar.gz set sourceFolder=nspr-%version%-%BuildBits% set tarFolder=nspr-%version% @@ -52,20 +52,18 @@ for /f "delims=" %%a in ('dir /b %tarFolder%') do ( move "%CD%\%tarFolder%\%%a" "%CD%" ) -echo. -echo Patching -patch -p0 -i "%curDir%\configure%BuildBits%.patch" - echo. echo Configuring cd mozilla\nsprpub -sh ./configure --prefix="%usrLocalDir%" --enable-strip --enable-win32-target=WIN95 --enable-optimize --disable-debug +set LDFLAGS=-shared-libgcc +sh ./configure --prefix="%usrLocalDir%" --enable-strip --enable-win32-target=WIN95 --enable-optimize="-O3 %CFLAGS%" --disable-debug if errorlevel 1 goto end echo. pause -make +if "%BuildBits%" == "32" set RC=RC="windres -F pe-i386" CC="gcc -m32" +make %RC% if errorlevel 1 goto end make install diff --git a/foreignBuilds/mswin/nspr/configure32.patch b/foreignBuilds/mswin/nspr/configure32.patch deleted file mode 100644 index e69c55a327..0000000000 --- a/foreignBuilds/mswin/nspr/configure32.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- mozilla/nsprpub/configure.orig 2012-02-15 06:06:00 +1100 -+++ mozilla/nsprpub/configure 2012-02-21 14:07:22 +1100 -@@ -748,7 +748,7 @@ - USE_IPV6= - USE_MDUPDATE= - _MACOSX_DEPLOYMENT_TARGET= --_OPTIMIZE_FLAGS=-O -+_OPTIMIZE_FLAGS=-O3 - _DEBUG_FLAGS=-g - MOZ_DEBUG=1 - MOZ_OPTIMIZE= -@@ -4536,10 +4536,10 @@ - CC="$CC -mwindows" - CXX="$CXX -mwindows" - DLL_SUFFIX=dll -- MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' -+ MKSHLIB='$(CC) $(CFLAGS) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' - RC=$WINDRES - # Use temp file for windres (bug 213281) -- RCFLAGS='-O coff --use-temp-file' -+ RCFLAGS='-F pe-i386 -O coff --use-temp-file' - else - CC=cl - CXX=cl diff --git a/foreignBuilds/mswin/nspr/configure64.patch b/foreignBuilds/mswin/nspr/configure64.patch deleted file mode 100644 index 319cfcd64f..0000000000 --- a/foreignBuilds/mswin/nspr/configure64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/nsprpub/configure 2011-07-28 14:08:33 +0100 -+++ mozilla/nsprpub/configure 2011-10-10 22:03:36 +0100 -@@ -743,7 +743,7 @@ - USE_IPV6= - USE_MDUPDATE= - _MACOSX_DEPLOYMENT_TARGET= --_OPTIMIZE_FLAGS=-O -+_OPTIMIZE_FLAGS=-O3 - _DEBUG_FLAGS=-g - MOZ_DEBUG=1 - MOZ_OPTIMIZE= diff --git a/foreignBuilds/mswin/qt/Perform Build.bat b/foreignBuilds/mswin/qt/Perform Build.bat index ea80947e5c..76edf59b85 100644 --- a/foreignBuilds/mswin/qt/Perform Build.bat +++ b/foreignBuilds/mswin/qt/Perform Build.bat @@ -84,7 +84,7 @@ patch -p0 -i "%curDir%\qmake%BuildBits%.conf.patch" echo. echo Configuring -configure -confirm-license -opensource -%BuildType% -system-zlib -no-stl -no-qt3support -no-phonon -no-webkit -no-multimedia -no-declarative -no-style-cleanlooks -no-style-plastique -no-style-motif -no-style-cde -qt-style-windowsxp -qt-style-windowsvista -no-xmlpatterns -nomake demos -nomake examples -platform win32-g++ -mmx -sse -sse2 -3dnow -I %CMAKE_INCLUDE_PATH% -L %CMAKE_LIBRARY_PATH% %LeakFlags% +configure -confirm-license -opensource -%BuildType% -system-zlib -no-stl -no-qt3support -no-phonon -no-webkit -no-multimedia -no-declarative -no-style-cleanlooks -no-style-plastique -no-style-motif -no-style-cde -qt-style-windowsxp -qt-style-windowsvista -no-xmlpatterns -nomake demos -nomake examples -platform win32-g++ -mmx -sse -sse2 -3dnow -I %CMAKE_INCLUDE_PATH:;= -I % -L %CMAKE_LIBRARY_PATH:;= -L % %LeakFlags% if errorlevel 1 goto end echo. diff --git a/foreignBuilds/mswin/qt/qmake32.conf.patch b/foreignBuilds/mswin/qt/qmake32.conf.patch index d71ee488e5..2e16fe3dfb 100644 --- a/foreignBuilds/mswin/qt/qmake32.conf.patch +++ b/foreignBuilds/mswin/qt/qmake32.conf.patch @@ -14,7 +14,7 @@ QMAKE_LINK = g++ QMAKE_LINK_C = gcc -QMAKE_LFLAGS = -+QMAKE_LFLAGS = -m32 -shared-libgcc -shared-libstdc++ ++QMAKE_LFLAGS = -m32 -shared-libgcc QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads QMAKE_LFLAGS_EXCEPTIONS_OFF = QMAKE_LFLAGS_RELEASE = -Wl,-s diff --git a/foreignBuilds/mswin/qt/qmake64.conf.patch b/foreignBuilds/mswin/qt/qmake64.conf.patch index 711d6e661b..8c0066bcae 100644 --- a/foreignBuilds/mswin/qt/qmake64.conf.patch +++ b/foreignBuilds/mswin/qt/qmake64.conf.patch @@ -5,7 +5,7 @@ QMAKE_LINK = g++ QMAKE_LINK_C = gcc -QMAKE_LFLAGS = -+QMAKE_LFLAGS = -shared-libgcc -shared-libstdc++ ++QMAKE_LFLAGS = -shared-libgcc QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads QMAKE_LFLAGS_EXCEPTIONS_OFF = QMAKE_LFLAGS_RELEASE = -Wl,-s diff --git a/foreignBuilds/mswin/twolame/Perform Build.bat b/foreignBuilds/mswin/twolame/Perform Build.bat index d7b60a44a5..e3e0ad5a62 100644 --- a/foreignBuilds/mswin/twolame/Perform Build.bat +++ b/foreignBuilds/mswin/twolame/Perform Build.bat @@ -57,7 +57,7 @@ if errorlevel 1 goto end echo. pause -make CFLAGS="-O3 -DLIBTWOLAME_DLL_EXPORTS" LDFLAGS="-no-undefined" install-strip +make CFLAGS="%CFLAGS% -O3 -DLIBTWOLAME_DLL_EXPORTS" LDFLAGS="%LDFLAGS% -no-undefined" install-strip if errorlevel 1 goto end copy "%usrLocalDir%\bin\libtwolame-0.dll" "%admBuildDir%" diff --git a/foreignBuilds/mswin/win-iconv/Perform Build.bat b/foreignBuilds/mswin/win-iconv/Perform Build.bat new file mode 100644 index 0000000000..dc49d3029d --- /dev/null +++ b/foreignBuilds/mswin/win-iconv/Perform Build.bat @@ -0,0 +1,61 @@ +@echo off + +echo MSYS build for win-iconv +echo ======================== +echo 1. 32-bit build +echo 2. 64-bit build +echo X. Exit +echo. + +choice /c 12x + +if errorlevel 1 set BuildBits=32 +if errorlevel 2 set BuildBits=64 +if errorlevel 3 goto :eof + +verify >nul +call "../Set Common Environment Variables" +if errorlevel 1 goto end + +set version=20100912 +set package=win-iconv-dev_tml-%version%_win64.zip +set sourceFolder=win-iconv-%version%-%BuildBits% +set curDir=%CD% +set PATH=%PATH%;%msysDir%\bin + +if not exist %package% ( + echo. + echo Downloading + wget http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/%package%/ +) + +if errorlevel 1 goto error + +echo. +echo Preparing +rm -r -f "%devDir%\%sourceFolder%" +if errorlevel 1 goto error + +mkdir "%devDir%\%sourceFolder%" +if errorlevel 1 goto error + +cd "%devDir%\%sourceFolder%" +unzip "%curDir%\%package%" +if errorlevel 1 goto error + +gcc %CFLAGS% -O3 -o win_iconv.win64.o -c src/tml/win_iconv/win_iconv.c +if errorlevel 1 goto error + +ar crv "%usrLocalDir%/lib/libiconv.a" win_iconv.win64.o +if errorlevel 1 goto error + +copy src\tml\win_iconv\iconv.h "%usrLocalDir%/include" +if errorlevel 1 goto error + +goto end + +:error +echo Error + +:end +pause \ No newline at end of file diff --git a/foreignBuilds/mswin/zlib/Perform Build.bat b/foreignBuilds/mswin/zlib/Perform Build.bat new file mode 100644 index 0000000000..53373bc647 --- /dev/null +++ b/foreignBuilds/mswin/zlib/Perform Build.bat @@ -0,0 +1,69 @@ +@echo off + +echo MSYS build for zlib +echo =================== +echo 1. 32-bit build +echo 2. 64-bit build +echo X. Exit +echo. + +choice /c 12x + +if errorlevel 1 set BuildBits=32 +if errorlevel 2 set BuildBits=64 +if errorlevel 3 goto :eof + +verify >nul +call "../Set Common Environment Variables" +if errorlevel 1 goto end + +set version=1.2.7 +set package=zlib-%version%.tar.gz +set sourceFolder=zlib-%version%-%BuildBits% +set tarFolder=zlib-%version% +set curDir=%CD% +set PATH=%PATH%;%msysDir%\bin + +if not exist %package% ( + echo. + echo Downloading + wget http://zlib.net/%package% +) + +if errorlevel 1 goto end + +echo. +echo Preparing +rm -r -f "%devDir%\%sourceFolder%" +if errorlevel 1 goto end + +mkdir "%devDir%\%sourceFolder%" +if errorlevel 1 goto end + +tar xfz "%package%" -C "%devDir%\\%sourceFolder%" +if errorlevel 1 goto end +cd "%devDir%\%sourceFolder%" + +for /f "delims=" %%a in ('dir /b %tarFolder%') do ( + move "%CD%\%tarFolder%\%%a" "%CD%" +) + +if "%BuildBits%" == "32" set RC=RC="windres -F pe-i386" +mingw32-make -f win32/Makefile.gcc CFLAGS="%CFLAGS%" LDFLAGS="%LDFLAGS%" %RC% +if errorlevel 1 goto end + +copy zlib1.dll "%usrLocalDir%\bin" +copy zconf.h "%usrLocalDir%\include" +copy zlib.h "%usrLocalDir%\include" +copy libz.a "%usrLocalDir%\lib" +copy libz.dll.a "%usrLocalDir%\lib" + +copy "%usrLocalDir%\bin\zlib1.dll" "%admBuildDir%" + +goto end + +:error +echo Error + +:end +pause \ No newline at end of file