Skip to content

V
vlc
Commit be671af1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contrib: fix FFmpeg for Win64 compilation

parent 32146fe2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
extras/contrib/src/Makefile
View file @ be671af1
...@@ -59,7 +59,6 @@ endif ...@@ -59,7 +59,6 @@ endif
ifneq ($(CC),) ifneq ($(CC),)
HOSTCC+= CC="$(CC)" HOSTCC+= CC="$(CC)"
FFMPEGCONF += --cc=$(CC)
endif endif
ifneq ($(CXX),) ifneq ($(CXX),)
HOSTCC+= CXX="$(CXX)" HOSTCC+= CXX="$(CXX)"
...@@ -117,9 +116,11 @@ endif ...@@ -117,9 +116,11 @@ endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686 FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686
endif
ifdef HAVE_WIN64 ifdef HAVE_WIN64
FFMPEGCONF+= --cpu=x86_64 FFMPEGCONF+= --cpu=i686 --arch=x86_64
else
FFMPEGCONF+= --cpu=i686 --arch=x86_32
endif
endif endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
......
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