Commit c30a1167 authored by gbazin's avatar gbazin
Browse files

* extras/contrib/src/Makefile: disable asm in FLAC on win32 since its build...

* extras/contrib/src/Makefile: disable asm in FLAC on win32 since its build system insists on creating elf objects (would need fixing).
parent d2331ea3
...@@ -137,11 +137,11 @@ else ...@@ -137,11 +137,11 @@ else
else else
ifdef HAVE_WIN32 ifdef HAVE_WIN32
all: .iconv .intl .freetype .fribidi .zlib\ all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame\ .live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .libmpcdec .portaudio\ .png .gpg-error .gcrypt .gnutls .libmpcdec .portaudio \
.gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \ .gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \
.dx_headers .dshow_headers .aclocal .gecko-win32 .dx_headers .dshow_headers .aclocal .gecko-win32
# .SDL_image .daap .cddb .cdio .vcdimager .dts # .SDL_image .daap .cddb .cdio .vcdimager .dts
...@@ -642,8 +642,11 @@ ifneq ($(HOST),$(BUILD)) ...@@ -642,8 +642,11 @@ ifneq ($(HOST),$(BUILD))
endif endif
.FLAC: flac .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 && 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) $(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