Skip to content

V
vlc-1.1
Commit 2a268e6e authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* extras/contrib/Makefile, Patches/x264-svn-win32.patch: x264 win32 build fix.

parent a6ad4f57
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
extras/contrib/src/Makefile
View file @ 2a268e6e
...@@ -86,7 +86,7 @@ HOSTCC=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR=$(HOST)-ar RANLIB=$(HOST)-ranlib ...@@ -86,7 +86,7 @@ HOSTCC=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR=$(HOST)-ar RANLIB=$(HOST)-ranlib
# For libebml/libmatroska. Grrr. # For libebml/libmatroska. Grrr.
HOSTCC2=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR="$(HOST)-ar rcvu" RANLIB=$(HOST)-ranlib HOSTCC2=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR="$(HOST)-ar rcvu" RANLIB=$(HOST)-ranlib
FFMPEGCONF=--cross-prefix=$(HOST)- FFMPEGCONF=--cross-prefix=$(HOST)-
X264CONF=--cross-prefix=$(HOST) X264CONF=--crosscompile=$(HOST)
LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o" LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o"
RANLIB=$(HOST)-ranlib RANLIB=$(HOST)-ranlib
else else
......
extras/contrib/src/Patches/x264-svn-win32.patch
View file @ 2a268e6e
...@@ -255,7 +255,7 @@ Index: common/i386/mc-a2.asm ...@@ -255,7 +255,7 @@ Index: common/i386/mc-a2.asm
+ CC="$CROSS-gcc" + CC="$CROSS-gcc"
+ AR="$CROSS-ar" + AR="$CROSS-ar"
+ RANLIB="$CROSS-ranlib" + RANLIB="$CROSS-ranlib"
+ UNAMES="`echo $CROSS | cut -d- -f3`" + UNAMES="`echo $CROSS | cut -d- -f2`"
+ UNAMEM="`echo $CROSS | cut -d- -f1`" + UNAMEM="`echo $CROSS | cut -d- -f1`"
+ ;; + ;;
+ --prefix=*) + --prefix=*)
......
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