Skip to content

V
vlc-gpu
Commit f227739a authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf
Browse files
Options

Win64: try to fix Cmake on Win64 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent aeb72005
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
extras/contrib/src/Distributions/win64.mak
View file @ f227739a
...@@ -8,8 +8,8 @@ all: .iconv .intl .freetype .fribidi .zlib \ ...@@ -8,8 +8,8 @@ all: .iconv .intl .freetype .fribidi .zlib \
.dca .kate .libass .SDL_image \ .dca .kate .libass .SDL_image \
.libbluray .dvdcss .libupnp .dvdnav .qt4_win32 \ .libbluray .dvdcss .libupnp .dvdnav .qt4_win32 \
.dx_headers .dshow_headers .portaudio .gecko \ .dx_headers .dshow_headers .portaudio .gecko \
.lua .peflags .lua .peflags .sqlite3 .tag
# .libprojectM .tag .sqlite3 ## FIXME: these need working cmake # .libprojectM
# .pthreads # .pthreads
#.zvbi \ #.zvbi \
# .fluid # .fluid
......
extras/contrib/src/contrib-src.mak
View file @ f227739a
...@@ -2233,8 +2233,13 @@ ifdef HAVE_CYGWIN ...@@ -2233,8 +2233,13 @@ ifdef HAVE_CYGWIN
patch -p0 < Patches/taglib-cygwin.patch patch -p0 < Patches/taglib-cygwin.patch
endif endif
ifdef HAVE_WIN64
TAGLIB_CMAKE_OPTS=-DCMAKE_SYSTEM_NAME=Generic
else
TAGLIB_CMAKE_OPTS=
endif
.tag: taglib .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) $(INSTALL_NAME)
touch $@ touch $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment