aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authortheuni <theuni-nospam-@xbmc.org>2012-06-10 02:47:22 -0400
committerCory Fields <theuni-nospam-@xbmc.org>2012-08-08 18:59:20 -0400
commita0df101d62050cfabb9371f5f874623944c04f14 (patch)
tree181273fad2e6abbe92dd8d58f21b0af8fc9ff44e /lib
parent3a17cd7b68f71b7750abba0c606d3cce3af3a343 (diff)
[droid] libs: add a few links to libmath
Since android is so picky about undefined symbols, as a test-build I disabled --unresolved-symbols=ignore-all and enabled -Wl,--no-unresolved I then changed the wrapper.def to point to the real libxbmc so that our wrapped symbols could be found. In addition to the previous cmyth commit, these turned up as needing -lm. With this, all libs that link against libxbmc as well as the ones we build are verified as having no undefined symbols. Curse you bionic.
Diffstat (limited to 'lib')
-rw-r--r--lib/libdvd/Makefile.in4
-rw-r--r--lib/libhdhomerun/Makefile.in2
-rw-r--r--lib/nosefart/Makefile.in2
-rw-r--r--lib/xbadpcm/Makefile.in2
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
index 1534f33158..69d2286e1e 100644
--- a/lib/libdvd/Makefile.in
+++ b/lib/libdvd/Makefile.in
@@ -56,11 +56,11 @@ else
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all \
+ libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
-Wl,--unresolved-symbols=ignore-all \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
diff --git a/lib/libhdhomerun/Makefile.in b/lib/libhdhomerun/Makefile.in
index 825bbde184..ce909c17ca 100644
--- a/lib/libhdhomerun/Makefile.in
+++ b/lib/libhdhomerun/Makefile.in
@@ -24,7 +24,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
else
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all \
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all -lm \
`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
endif
diff --git a/lib/nosefart/Makefile.in b/lib/nosefart/Makefile.in
index f8a8397cec..0da88b6a76 100644
--- a/lib/nosefart/Makefile.in
+++ b/lib/nosefart/Makefile.in
@@ -31,7 +31,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all -lm \
`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
endif
diff --git a/lib/xbadpcm/Makefile.in b/lib/xbadpcm/Makefile.in
index 2a53042781..0a2bc43e44 100644
--- a/lib/xbadpcm/Makefile.in
+++ b/lib/xbadpcm/Makefile.in
@@ -12,7 +12,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o *.o $(BUNDLE1_O)
chmod +x $@
else
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ *.o -Wl,--unresolved-symbols=ignore-all \
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ *.o -Wl,--unresolved-symbols=ignore-all -lm \
`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
endif