From: Gildas Bazin <gbazin@videolan.org>
Date: Wed, 2 Nov 2005 19:46:55 +0000 (+0000)
Subject: * extras/contrib/src/Makefile: disable asm in FLAC on win32 since its build system... 
X-Git-Tag: 0.9.0-test0~13405
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c30a11676cd66ca9c68dbc10ab3d7cecfc2b95bb;p=vlc

* extras/contrib/src/Makefile: disable asm in FLAC on win32 since its build system insists on creating elf objects (would need fixing).
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 80d69cbacc..8bcd611b89 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -137,11 +137,11 @@ else
  else
   ifdef HAVE_WIN32
 
-   all: .iconv .intl .freetype .fribidi .zlib\
+   all: .iconv .intl .freetype .fribidi .zlib \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame\
-	.png .gpg-error .gcrypt .gnutls .libmpcdec .portaudio\
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.png .gpg-error .gcrypt .gnutls .libmpcdec .portaudio \
 	.gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \
 	.dx_headers .dshow_headers .aclocal .gecko-win32
 #	.SDL_image  .daap .cddb .cdio .vcdimager .dts
@@ -642,8 +642,11 @@ ifneq ($(HOST),$(BUILD))
 endif
 
 .FLAC: flac 
+ifdef HAVE_WIN32
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest --disable-asm-optimizations && cd src&& make -C libFLAC&& make -C libFLAC install  && cd .. && make -C include install)
+else
 	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install  && cd .. && make -C include install)
-#	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && make -C libOggFLAC &&make -C libOggFLAC install && cd .. && make -C include install)
+endif
 	$(INSTALL_NAME)
 	touch $@