summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2005-01-20 07:04:42 +0000
committerMichael Johnson <ahze@FreeBSD.org>2005-01-20 07:04:42 +0000
commitb75fd48c68efc79a3e9442aa292161c0b131d389 (patch)
tree89785488868bea2e29a57bd8e2f19ab17e2917c8 /multimedia
parent- Fix typo (diff)
- Link to ASM files so shared library actually works.
Notes
Notes: svn path=/head/; revision=126903
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/x264-devel/files/patch-Makefile2
-rw-r--r--multimedia/x264/files/patch-Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index 4fbd383809c4..7bd3c4d0f36a 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -29,7 +29,7 @@
$(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm
+
+$(SHARED_LIB_VER): $(OBJS) x264
-+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS)
++ $(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
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
index 4fbd383809c4..7bd3c4d0f36a 100644
--- a/multimedia/x264/files/patch-Makefile
+++ b/multimedia/x264/files/patch-Makefile
@@ -29,7 +29,7 @@
$(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm
+
+$(SHARED_LIB_VER): $(OBJS) x264
-+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS)
++ $(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