Skip to content

V
vlc
Commit ef64f16e authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf
Browse files
Options

Contribs: ffmpeg, do not assume i*86 if not WIN64 on Windows 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 7448143e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
contrib/src/ffmpeg/rules.mak
View file @ ef64f16e
...@@ -158,9 +158,11 @@ FFMPEGCONF += --enable-w32threads --enable-dxva2 ...@@ -158,9 +158,11 @@ FFMPEGCONF += --enable-w32threads --enable-dxva2
ifdef HAVE_WIN64 ifdef HAVE_WIN64
FFMPEGCONF += --cpu=athlon64 --arch=x86_64 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
else # !WIN64 else
ifeq ($(ARCH),i386) # 32bits intel
FFMPEGCONF+= --cpu=i686 --arch=x86 FFMPEGCONF+= --cpu=i686 --arch=x86
endif endif
endif
else # !Windows else # !Windows
FFMPEGCONF += --enable-pthreads FFMPEGCONF += --enable-pthreads
......
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