[vlmc-devel] CMake: Fix script variable and cross compilation.

[Rohit Yadav]

vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Thu Mar  1 15:11:26 2012 +0530| [e752139e63d6a8dd1fa763de14175538a687ce1c] | committer: Rohit Yadav

CMake: Fix script variable and cross compilation.
Fixes #410, use supplied moc binary for Qt4.8 contrib.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=e752139e63d6a8dd1fa763de14175538a687ce1c
---

 INSTALL.win32        |    3 +++
 contribs/contribs.sh |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/INSTALL.win32 b/INSTALL.win32
index 97ee98c..acee36e 100644
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -11,6 +11,9 @@ Configure
 mkdir win32 && cd win32
 cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-win32.cmake ..
 
+Use -D flag to set cmake flags such as:
+cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-win32.cmake -DQT_MOC_EXECUTABLE=../contribs/tools/moc.exe ..
+
 Build
 -----
 make
diff --git a/contribs/contribs.sh b/contribs/contribs.sh
index 08fd098..78cbc07 100644
--- a/contribs/contribs.sh
+++ b/contribs/contribs.sh
@@ -2,7 +2,8 @@
 
 QT4_FILE="qt4-4.8-win32-bin.tar.bz2"
 QT4_URL="http://rohityadav.in/files/contribs/qt4-4.8-win32-bin.tar.bz2"
-VLC_FILE="vlc-1.1.11-win32.7z"
+VLC_VERSION_PREFIX="vlc-1.1.11"
+VLC_FILE="${VLC_VERSION_PREFIX}-win32.7z"
 VLC_URL="http://download.videolan.org/vlc/1.1.11/win32/${VLC_FILE}"
 FREI0R_FILE="frei0r-plugins-1.2.1.tar.gz"
 FREI0R_URL="http://www.piksel.no/frei0r/releases/frei0r-plugins-1.2.1.tar.gz"