[vlmc-devel] CMake: Update VLC_URL to stable release

[Rohit Yadav]

vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Mon Feb 27 10:10:14 2012 +0530| [3a7da2ee03e3d859cf285013d9b1eaa87a971244] | committer: Rohit Yadav

CMake: Update VLC_URL to stable release
Also explicity set CMAKE_RC_COMPILER flag.

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

 cmake/toolchain-win32.cmake |    4 ++++
 contribs/contribs.sh        |    6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmake/toolchain-win32.cmake b/cmake/toolchain-win32.cmake
index 642ede3..8d6feff 100644
--- a/cmake/toolchain-win32.cmake
+++ b/cmake/toolchain-win32.cmake
@@ -18,6 +18,10 @@ ENDIF(NOT CMAKE_CXX_COMPILER)
 IF(NOT CMAKE_WINDRES)
 SET(CMAKE_WINDRES      i586-mingw32msvc-windres)
 ENDIF(NOT CMAKE_WINDRES)
+#Explicity set rc_compiler flag
+IF(NOT CMAKE_RC_COMPILER)
+SET(CMAKE_RC_COMPILER  i586-mingw32msvc-windres)
+ENDIF(NOT CMAKE_RC_COMPILER)
 
 # where is the target environment 
 SET(CMAKE_FIND_ROOT_PATH  ${CMAKE_SOURCE_DIR}/contribs)
diff --git a/contribs/contribs.sh b/contribs/contribs.sh
index 2cc3b07..08fd098 100644
--- a/contribs/contribs.sh
+++ b/contribs/contribs.sh
@@ -2,10 +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_VERSION_DATE="20110719-0203"
-VLC_VERSION_PREFIX="vlc-1.1.11"
-VLC_FILE="${VLC_VERSION_PREFIX}-win32.7z"
-VLC_URL="http://nightlies.videolan.org/build/win32/branch-${VLC_VERSION_DATE}/${VLC_FILE}"
+VLC_FILE="vlc-1.1.11-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"
 FREI0R_EFFECTS_FILE="effects.7z"