diff options
Diffstat (limited to 'multimedia/x264-devel/files/patch-Makefile')
| -rw-r--r-- | multimedia/x264-devel/files/patch-Makefile | 77 |
1 files changed, 34 insertions, 43 deletions
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile index 6a8172d..05eb5a7 100644 --- a/multimedia/x264-devel/files/patch-Makefile +++ b/multimedia/x264-devel/files/patch-Makefile @@ -1,59 +1,50 @@ ---- Makefile.orig Tue Jan 25 16:36:54 2005 -+++ Makefile Mon Jan 31 01:14:20 2005 -@@ -12,18 +12,19 @@ - encoder/set.c encoder/macroblock.c encoder/cabac.c \ - encoder/cavlc.c encoder/encoder.c encoder/eval.c x264.c - --ifdef SYS_MACOSX --PFLAGS=-DARCH_PPC -DSYS_MACOSX -faltivec --SRCS= $(SRCS_COMMON) common/ppc/mc.c common/ppc/pixel.c --else --PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2 -DHAVE_MALLOC_H +--- Makefile.orig Thu Apr 21 08:02:33 2005 ++++ Makefile Thu Apr 21 08:11:28 2005 +@@ -10,7 +10,7 @@ + encoder/cavlc.c encoder/encoder.c encoder/eval.c + + # MMX/SSE optims +-ifeq ($(ARCH),X86) +ifdef ARCH_X86 - SRCS= $(SRCS_COMMON) common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c - ASMSRC= common/i386/dct-a.asm common/i386/cpu-a.asm common/i386/pixel-a.asm common/i386/mc-a.asm - OBJASM= $(ASMSRC:%.asm=%.o) -+else -+SRCS= $(SRCS_COMMON) + SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c + ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \ + common/i386/pixel-a.asm common/i386/mc-a.asm \ +@@ -19,7 +19,7 @@ endif --CC=gcc --CFLAGS=-Wall -I. -O4 -funroll-loops -D__X264__ $(PFLAGS) -+SHARED_LIB= libx264.so -+SHARED_LIB_VER= $(SHARED_LIB).%%SHLIB_VER%% -+ -+CFLAGS=-I. -D__X264__ %%CFLAGS%% -fPIC -+ - ifdef NDEBUG - CFLAGS+=-s -DNDEBUG - else -@@ -39,14 +40,17 @@ + # MMX/SSE optims +-ifeq ($(ARCH),X86_64) ++ifdef ARCH_X86_64 + SRCS += common/amd64/mc-c.c common/amd64/dct-c.c common/amd64/predict.c + ASMSRC = common/amd64/dct-a.asm common/amd64/cpu-a.asm \ + common/amd64/pixel-a.asm common/amd64/mc-a.asm \ +@@ -35,19 +35,25 @@ OBJS = $(SRCS:%.c=%.o) DEP = depend --default: $(DEP) x264 -+default: $(DEP) x264 $(SHARED_LIB_VER) +-default: $(DEP) x264$(EXE) ++SHARED_LIB = libx264.so ++SHARED_LIB_VER = $(SHARED_LIB).1 ++ ++default: $(DEP) x264$(EXE) $(SHARED_LIB_VER) - libx264.a: $(OBJS) $(OBJASM) + libx264.a: .depend $(OBJS) $(OBJASM) ar rc libx264.a $(OBJS) $(OBJASM) ranlib libx264.a --x264: libx264.a x264.o -- $(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm -+x264: $(SHARED_LIB_VER) x264.o -+ $(CC) $(CFLAGS) -o x264 x264.o $(SHARED_LIB_VER) -lm +-x264$(EXE): libx264.a x264.o +- $(CC) -o $@ x264.o libx264.a $(LDFLAGS) ++x264$(EXE): $(SHARED_LIB_VER) x264.o ++ $(CC) -o $@ x264.o $(SHARED_LIB_VER) $(LDFLAGS) + +$(SHARED_LIB_VER): $(OBJS) libx264.a + $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS) $(OBJASM) -lm - checkasm: testing/checkasm.c libx264.a - $(CC) $(CFLAGS) -o checkasm $< libx264.a -lm -@@ -56,7 +60,7 @@ + x264vfw.dll: libx264.a $(wildcard vfw/*.c vfw/*.h) + make -C vfw/build/cygwin - .depend: $(SRCS) x264.c - rm -f .depend -- $(foreach SRC, $(SRCS) x264.c, $(CC) $(CFLAGS) $(SRC) -MM -MT $(SRC:%.c=%.o) 1>> .depend;) -+ $(CC) -MM $(CFLAGS) $(SRCS) x264.c 1> .depend +-checkasm: testing/checkasm.o libx264.a ++checkasm: testing/checkasm.o $(SHARED_LIB_VER) + $(CC) -o $@ $< libx264.a $(LDFLAGS) - depend: .depend - ifneq ($(wildcard .depend),) + %.o: %.asm |
