[build] update win64 cross compiling stuff

git-svn-id: svn://svn.berlios.de/avidemux/branches/avidemux_2.6_branch_mean@8311 30592fff-cfd4-0310-bf0e-8235a3c7be26
szlldm · Dec 15, 2012 · e7178d6 · e7178d6
1 parent b639eee
commit e7178d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/bootStrapCrossMingw_w64.sh b/bootStrapCrossMingw_w64.sh
@@ -4,7 +4,7 @@ export PATH=$PATH:/mingw/bin
 export CROSS_PREFIX=x86_64-w64-mingw32
 export SDLDIR=/mingw
 export MINGW=/mingw
-export QT_HOME=/mingw/Qt/qt471win64
+export QT_HOME=/mingw/Qt/current
 export CFLAGS="-fpermissive"
 export O_PARAL="-j 2"
 # ** Put your config here **

diff --git a/foreignBuilds/cross_mingw64_core b/foreignBuilds/cross_mingw64_core
@@ -17,6 +17,7 @@ cmake   -DCROSS=$MINGW \
         -DCMAKE_LINKER:STRING=$CROSS_PREFIX-ld \
         -DCMAKE_AR:STRING=$CROSS_PREFIX-ar \
         -DCMAKE_SYSTEM_NAME:STRING=Windows \
+        -DCMAKE_RC_COMPILER:STRING=$MINGW/bin/$CROSS_PREFIX-windres \
         $DEBUG\
         -DAVIDEMUX_TOP_SOURCE_DIR="$TOP"  \
         $TOP/avidemux_core
diff --git a/foreignBuilds/cross_mingw64_plugins b/foreignBuilds/cross_mingw64_plugins
@@ -16,6 +16,7 @@ cmake   -DCROSS=$MINGW \
         -DCMAKE_CXX_COMPILER:STRING=$CROSS_PREFIX-g++ \
         -DCMAKE_LINKER:STRING=$CROSS_PREFIX-ld \
         -DCMAKE_AR:STRING=$CROSS_PREFIX-ar \
+  	-DCMAKE_RC_COMPILER:STRING=$MINGW/bin/$CROSS_PREFIX-windres \
         -DCMAKE_SYSTEM_NAME:STRING=Windows \
         -DQT_HOME:STRING=$QT_HOME \
          $DEBUG \

diff --git a/foreignBuilds/cross_mingw64_qt4 b/foreignBuilds/cross_mingw64_qt4
@@ -14,7 +14,7 @@ cmake   -DCROSS=$MINGW \
         -DCMAKE_INSTALL_PREFIX=$MINGW/Release \
         -DQT_HOME:STRING=$QT_HOME \
 	-DCMAKE_CROSS_PREFIX=$CROSS_PREFIX \
-        -DCMAKE_WINDRES=$CROSS_PREFIX-windres \
+	-DCMAKE_RC_COMPILER:STRING=$MINGW/bin/$CROSS_PREFIX-windres \
         -DCMAKE_C_COMPILER:STRING=$CROSS_PREFIX-gcc \
         -DCMAKE_CXX_COMPILER:STRING=$CROSS_PREFIX-g++ \
         -DCMAKE_LINKER:STRING=$CROSS_PREFIX-ld \