Skip to content

V
vlc
Commit 3acd3c55 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: win32 cross-compilation fixes

parent bb6c6400
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
extras/contrib/src/Distributions/win32.mak
View file @ 3acd3c55
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
all: .iconv .intl .freetype .fribidi .zlib \ all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .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 .pthreads .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \ .png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \ .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
.dx_headers .dshow_headers .gecko-win32 .dca \ .dx_headers .dshow_headers .gecko-win32 .dca \
......
extras/contrib/src/Makefile
View file @ 3acd3c55
#*************************************************************************** #***************************************************************************
# src/Makefile : Dearchive and compile all files necessary # src/Makefile : Dearchive and compile all files necessary
# *************************************************************************** # ***************************************************************************
# Copyright (C) 2003 - 2008 the VideoLAN team # Copyright (C) 2003 - 2009 the VideoLAN team
# $Id$ # $Id$
# #
# Authors: Christophe Massiot <massiot@via.ecp.fr> # Authors: Christophe Massiot <massiot@via.ecp.fr>
...@@ -1872,7 +1872,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1 ...@@ -1872,7 +1872,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
.gcrypt: libgcrypt .gpg-error .gcrypt: libgcrypt .gpg-error
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install) (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && sed -i.orig '46s@sys/times.h@sys/time.h@' "cipher/random.c" && make && make install)
else else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
endif endif
...@@ -2276,7 +2276,7 @@ yasm: yasm-$(YASM_VERSION).tar.gz ...@@ -2276,7 +2276,7 @@ yasm: yasm-$(YASM_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
.yasm: yasm .yasm: yasm
(cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install) (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) --host=$(HOST) && make && make install)
touch $@ touch $@
CLEAN_FILE += .yasm CLEAN_FILE += .yasm
......
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