lcms2/makefile.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 9a2a5319b2ec8b816742b87fcf27bf73351fd01a
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Tue Jun 5 21:07:01 2012 -0500
play with the Layer thinggy for lcms2 to get the macosx build to finish
Change-Id: I9901d2ef270a096993630103b3cdb5b89e2bb829
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 50a42dd..6f619bf 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -72,6 +72,11 @@ CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" ./configure
--without-jpeg --without-t
CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS += \
+ --prefix=/@.__________________________________________________$(EXTRPATH)
+.END
+
.IF "$(OS)" == "IOS"
CONFIGURE_ACTION += --disable-shared
.ENDIF
@@ -83,7 +88,6 @@ BUILD_ACTION = $(GNUMAKE) -j$(GMAKE_MODULE_PARALLELISM)
OUT2INC+=include$/lcms2*.h
.IF "$(OS)"=="MACOSX"
-EXTRPATH=LOADER
OUT2LIB+=src$/.libs$/liblcms2.*.dylib
.ELIF "$(OS)"=="IOS"
OUT2LIB+=src$/.libs$/liblcms2.a
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
