changed, remove wrapping from cximage, obsolete with new Imagefactory

xbmc · Feb 7, 2013 · 056d824 · 056d824
1 parent 8381afe
commit 056d824
Showing 1 changed file with 3 additions and 6 deletions.
diff --git 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 \
+	$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup -lpng -ljpeg -ltiff -lz -o $@ \
-	-bundle -undefined dynamic_lookup -read_only_relocs suppress -lpng -ljpeg -ltiff -lz -o $@ \
+		CxImage/*.o jasper/*/*.o jbig/*.o raw/*.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 -Wl,--unresolved-symbols=ignore-all \
+		-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
 endif
 
 $(SLIBS): compile