From 056d8248ed51b545f85bd9c69d206a6a6433cab8 Mon Sep 17 00:00:00 2001 From: davilla Date: Thu, 7 Feb 2013 01:00:44 -0500 Subject: [PATCH] changed, remove wrapping from cximage, obsolete with new Imagefactory --- lib/cximage-6.0/Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/cximage-6.0/Makefile.in b/lib/cximage-6.0/Makefile.in index 9981e05662e1a..7f63e32054bc4 100644 --- a/lib/cximage-6.0/Makefile.in +++ b/lib/cximage-6.0/Makefile.in @@ -17,14 +17,11 @@ endif $(SLIB): $(SLIBS) ifeq ($(findstring osx,$(ARCH)), osx) - $(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 + $(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup -lpng -ljpeg -ltiff -lz -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 -Wl,--unresolved-symbols=ignore-all \ - `cat ../../xbmc/cores/DllLoader/exports/wrapper.def` \ - ../../xbmc/cores/DllLoader/exports/wrapper.o + -Wl,--no-whole-archive -lpng -ljasper -ljpeg -ltiff -lz -Wl,--unresolved-symbols=ignore-all endif $(SLIBS): compile