[mswin] update build scripts

git-svn-id: svn://svn.berlios.de/avidemux/branches/avidemux_2.6_branch_mean@7994 30592fff-cfd4-0310-bf0e-8235a3c7be26
szlldm · May 31, 2012 · e0f6a93 · e0f6a93
1 parent 84e6f12
commit e0f6a93
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 0 deletions.
diff --git a/avidemux/winInstaller/avidemux.nsi b/avidemux/winInstaller/avidemux.nsi
@@ -523,6 +523,8 @@ SectionGroup Plugins SecGrpPlugin
 			SetOverwrite on
 			SetOutPath $INSTDIR\plugins\audioEncoders
 			${File} plugins\audioEncoders\libADM_ae_lav_mp2.dll
+			SetOutPath $INSTDIR
+			${File} libtwolame-*.dll
 		${MementoSectionEnd}
 		${MementoSection} "MP2 (TwoLAME)" SecAudEncTwoLame
 			SectionIn 1 2

diff --git a/foreignBuilds/mswin/avidemux/Package Notes.xml b/foreignBuilds/mswin/avidemux/Package Notes.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0"?>
 <log>
+  <buildentry revision="7990" date="2012-05-30" />
+  <buildentry revision="7984" date="2012-05-24">
+    <comment>Updated Qt to version 4.8.2.</comment>
+    <comment>Updated x264 to r2200.</comment>
+  </buildentry>
+  <buildentry revision="7970" date="2012-05-21" />
+  <buildentry revision="7959" date="2012-05-18">
+    <comment>Updated libvpx to 1.1.0.</comment>
+  </buildentry>
+  <buildentry revision="7927" date="2012-05-10">
+    <comment>Updated libvorbis to 1.3.3.</comment>
+  </buildentry>
+  <buildentry revision="7915" date="2012-05-02" />
   <buildentry revision="7907" date="2012-04-28">
     <comment>Updated x264 to r2197.</comment>
   </buildentry>

diff --git a/foreignBuilds/mswin/twolame/Perform Build.bat b/foreignBuilds/mswin/twolame/Perform Build.bat
@@ -0,0 +1,71 @@
+@echo off
+
+echo MSYS build for twolame
+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=0.3.13
+set package=twolame-%version%.tar.gz
+set sourceFolder=twolame-%version%-%BuildBits%
+set tarFolder=twolame-%version%
+set curDir=%CD%
+set PATH=%PATH%;%msysDir%\bin
+
+if not exist %package% (
+	echo.
+	echo Downloading
+	wget http://sourceforge.net/projects/twolame/files/twolame/%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="-O3 -DLIBTWOLAME_DLL_EXPORTS" LDFLAGS="-no-undefined" install-strip
+if errorlevel 1 goto end
+
+copy "%usrLocalDir%\bin\libtwolame-0.dll" "%admBuildDir%"
+
+goto end
+
+:error
+echo Error
+
+:end
+pause