diff options
| author | S. Davilla <davilla@4pi.com> | 2011-03-09 00:04:18 -0500 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-03-09 00:23:03 -0500 |
| commit | 7f09c04d325765d51554697ed67117d2612156c1 (patch) | |
| tree | ec4342a5ea605ea303f54d0dfbcac19f961bae1d /lib/libdvd | |
| parent | b27f04cca4c421ae53e242884a3f0d4f5e8e6930 (diff) | |
[darwin] changed, replace wrapping with wrapper.rb with linker alias_list
Diffstat (limited to 'lib/libdvd')
| -rw-r--r-- | lib/libdvd/Makefile.in | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in index e7910dae16..91df03e69c 100644 --- a/lib/libdvd/Makefile.in +++ b/lib/libdvd/Makefile.in @@ -1,14 +1,23 @@ ARCH=@ARCH@ +SYSROOT=@SYSROOT@ +CC=@CC@ +CXX=@CXX@ + SYSDIR=@abs_top_srcdir@/system/players/dvdplayer SOS= libdvdnav-$(ARCH).so DIRS= libdvdread \ libdvdnav WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -WRAPPER_OSX=@abs_top_srcdir@/tools/Mach5/wrapper.rb +WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias +ifeq ($(findstring osx,$(ARCH)),osx) +LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress +else LDFLAGS += -shared -fPIC -rdynamic +endif + ifeq ($(ARCH), powerpc-osx) # Add -lbundle1.o for powerpc-osx BUNDLE1_O = -lbundle1.o @@ -36,15 +45,13 @@ all: $(SLIB) ifeq ($(findstring osx,$(ARCH)), osx) -$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER_OSX) libdvdcss/src/.libs/libdvdcss.a - ld -bundle -flat_namespace -undefined suppress -o $@ \ - libdvdcss/src/*.o $(BUNDLE1_O) - $(WRAPPER_OSX) $@;mv output.so $@ +$(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a + $(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ + $(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O) -$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a - ld -bundle -flat_namespace -undefined suppress -o $@ \ - $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O) - $(WRAPPER_OSX) $@;mv output.so $@ +$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a + $(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ + $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O) else |