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/cximage-6.0 | |
| parent | b27f04cca4c421ae53e242884a3f0d4f5e8e6930 (diff) | |
[darwin] changed, replace wrapping with wrapper.rb with linker alias_list
Diffstat (limited to 'lib/cximage-6.0')
| -rw-r--r-- | lib/cximage-6.0/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/cximage-6.0/Makefile.in b/lib/cximage-6.0/Makefile.in index 0267df0f07..9ad358a3d4 100644 --- a/lib/cximage-6.0/Makefile.in +++ b/lib/cximage-6.0/Makefile.in @@ -9,6 +9,7 @@ SLIBS=CxImage/cximage.a raw/raw.a jbig/jbig.a ifeq ($(findstring osx,$(ARCH)), osx) export ARCH + export SYSROOT DIRS+=jasper SLIBS+=jasper/jasper.a endif @@ -17,10 +18,9 @@ endif $(SLIB): $(SLIBS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -bundle -flat_namespace -undefined suppress -shared -lpng -ljpeg -ltiff -lz -o $@ \ - CxImage/*.o jasper/*/*.o jbig/*.o raw/*.o - ../../tools/Mach5/wrapper.rb $@;mv output.so $@ - chmod +x $@ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + -bundle -undefined dynamic_lookup -read_only_relocs suppress -lpng -ljpeg -ltiff -lz -o $@ \ + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o CxImage/*.o jasper/*/*.o jbig/*.o raw/*.o else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -o $(SLIB) -Wl,--whole-archive $(SLIBS) \ -Wl,--no-whole-archive -lpng -ljasper -ljpeg -ltiff -lz \ |