vlc | branch: master | Felix Paul Kühne <fkue...@videolan.org> | Fri Dec 31 16:06:26 2010 +0100| [9929e5b16fac4fbc5678ba87f02c841056e07fe6] | committer: Felix Paul Kühne
contribs: added another hack to crosscompile this broken library > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9929e5b16fac4fbc5678ba87f02c841056e07fe6 --- extras/contrib/bootstrap | 1 + extras/contrib/src/contrib-src.mak | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap index ca37868..ba7191e 100755 --- a/extras/contrib/bootstrap +++ b/extras/contrib/bootstrap @@ -402,6 +402,7 @@ add_makefile_cfg "EXTRA_PATH = ${EXTRA_PATH}" #CMAKE if test "$TARGET" != "$BUILD"; then toolchain_cmake="${BUILDDIR}/toolchain.cmake" + rm -f ${BUILDDIR}/toolchain.cmake if test ${DISTRO} = "win32"; then echo "SET(CMAKE_SYSTEM_NAME Windows)" >> "${toolchain_cmake}" fi diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index 4ab3aa8..5135921 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -2060,7 +2060,10 @@ DISTCLEAN_PKG += SDL_image-$(SDL_IMAGE_VERSION).tar.gz mpcdec: $(SVN) co $(MUSE_SVN) -r 468 mpcdec - cd $@; patch -p0 < ../Patches/libmpc-simple.patch + (cd $@; patch -p0 < ../Patches/libmpc-simple.patch) +ifdef HAVE_MACOSX + (cd $@; sed -e 's%-O3 -Wall%-O3 -Wall $(CFLAGS)%' -i.orig CMakeLists.txt) +endif .mpcdec: mpcdec (cd $<; cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits