[vlc-commits] Win64: try to fix Cmake on Win64

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Sep 23 17:56:24 2011 +0200| [f227739a6f3575d1265e8738206f32e774e62eaa] | committer: Jean-Baptiste Kempf

Win64: try to fix Cmake on Win64

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/contrib/src/Distributions/win64.mak |    4 ++--
 extras/contrib/src/contrib-src.mak         |    7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Distributions/win64.mak b/extras/contrib/src/Distributions/win64.mak
index fe7e84b..dff976c 100644
--- a/extras/contrib/src/Distributions/win64.mak
+++ b/extras/contrib/src/Distributions/win64.mak
@@ -8,8 +8,8 @@ all: .iconv .intl .freetype .fribidi .zlib \
         .dca .kate .libass .SDL_image  \
         .libbluray .dvdcss .libupnp .dvdnav .qt4_win32 \
         .dx_headers .dshow_headers .portaudio .gecko \
-        .lua .peflags
-# .libprojectM .tag .sqlite3 ## FIXME: these need working cmake
+        .lua .peflags .sqlite3 .tag
+# .libprojectM
 # .pthreads
 #.zvbi \
 #        .fluid
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 7957793..62c5e67 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2233,8 +2233,13 @@ ifdef HAVE_CYGWIN
 	patch -p0 < Patches/taglib-cygwin.patch
 endif
 
+ifdef HAVE_WIN64
+TAGLIB_CMAKE_OPTS=-DCMAKE_SYSTEM_NAME=Generic
+else
+TAGLIB_CMAKE_OPTS=
+endif
 .tag: taglib
-	(cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DENABLE_STATIC:BOOL=ON -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON && make && make install)
+	(cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DENABLE_STATIC:BOOL=ON -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON $(TAGLIB_CMAKE_OPTS) && make && make install)
 	$(INSTALL_NAME)
 	touch $@