]> git.sesse.net Git - vlc/blob - contrib/src/matroska/matroska-pic.patch
ffmpeg: don't force Intel Core 2 optimizations if not building 64-bit on Solaris
[vlc] / contrib / src / matroska / matroska-pic.patch
1 diff -ru libmatroska.orig/make/linux/Makefile libmatroska/make/linux/Makefile
2 --- libmatroska.orig/make/linux/Makefile        2011-06-15 15:00:37.000000000 +0300
3 +++ libmatroska/make/linux/Makefile     2011-08-03 13:33:25.000000000 +0300
4 @@ -65,7 +65,7 @@
5  # object files; replace .cxx extension with .o
6  objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
7  
8 -objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
9 +objects_so:=$(objects)
10  
11  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
12                 -Wshadow
13 @@ -89,9 +89,6 @@
14  
15  # Build rules
16  %.o: %$(EXTENSION)
17 -       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
18 -
19 -%.lo: %$(EXTENSION)
20         $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
21  
22  $(LIBRARY): $(objects)