[Avidemux-svn-commit] r5584 - in branches/avidemux_2.6_branch_mean: . foreignBuilds

mean at BerliOS mean at mail.berlios.de
Sat Nov 28 14:48:23 CET 2009


Author: mean
Date: 2009-11-28 14:48:23 +0100 (Sat, 28 Nov 2009)
New Revision: 5584

Modified:
   branches/avidemux_2.6_branch_mean/bootStrapCrossMingw_w32.sh
   branches/avidemux_2.6_branch_mean/foreignBuilds/cross_mingw_plugins
Log:
[Build] Update win32 X-scripts

Modified: branches/avidemux_2.6_branch_mean/bootStrapCrossMingw_w32.sh
===================================================================
--- branches/avidemux_2.6_branch_mean/bootStrapCrossMingw_w32.sh	2009-11-28 13:48:22 UTC (rev 5583)
+++ branches/avidemux_2.6_branch_mean/bootStrapCrossMingw_w32.sh	2009-11-28 13:48:23 UTC (rev 5584)
@@ -17,11 +17,12 @@
 {
         export BUILDDIR=$1
         export SCRIPT=$2
-        echo "Building $BUILDDIR from $SOURCEDIR"
+        export EXTRA=$3
+        echo "Building $BUILDDIR from $SOURCEDIR (Extra=$EXTRA)"
         rm -Rf ./$BUILDDIR
         mkdir $BUILDDIR || fail mkdir
         cd $BUILDDIR 
-        sh $TOP/foreignBuilds/$SCRIPT || fail cmake
+        sh $TOP/foreignBuilds/$SCRIPT $EXTRA || fail cmake
         make -j 2 > /tmp/log$BUILDDIR || fail make
         make install || fail make_install
 }
@@ -40,7 +41,8 @@
 #Process buildGtk ../avidemux/gtk
 echo "** Plugins **"
 cd $TOP
-Process buildMingwPlugins cross_mingw_plugins 
+Process buildMingwPluginsCommon cross_mingw_plugins -DPLUGIN_UI=COMMON
+Process buildMingwPluginsQt4 cross_mingw_plugins -DPLUGIN_UI=QT4
 echo "** All done **"
 cd $TOP
 echo "** ALL DONE **"

Modified: branches/avidemux_2.6_branch_mean/foreignBuilds/cross_mingw_plugins
===================================================================
--- branches/avidemux_2.6_branch_mean/foreignBuilds/cross_mingw_plugins	2009-11-28 13:48:22 UTC (rev 5583)
+++ branches/avidemux_2.6_branch_mean/foreignBuilds/cross_mingw_plugins	2009-11-28 13:48:23 UTC (rev 5584)
@@ -20,4 +20,5 @@
         -DQT_HOME:STRING=$QT_HOME \
          $DEBUG -G "CodeBlocks - Unix Makefiles"  \
         -DAVIDEMUX_SOURCE_DIR="$TOP"  \
+        $@ \
         $TOP/avidemux_plugins




More information about the Avidemux-svn-commit mailing list