[Libreoffice-commits] .: canvas/Library_cairocanvas.mk

[Tor Lillqvist]

 canvas/Library_cairocanvas.mk |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 3940f4b868e46ad28b9f799398b9e8b60c2b905d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jul 26 00:28:43 2011 +0300

    Make it build for iOS again

diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 424fe92..f0c89a7 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -49,7 +49,7 @@ endif
 ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Library_add_cxxflags,cairocanvas,\
-    -x objective-c++ -fobjc-exceptions\
+    $(gb_OBJCXXFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_libs,cairocanvas,\
@@ -58,6 +58,14 @@ $(eval $(call gb_Library_add_libs,cairocanvas,\
 
 endif
 
+ifeq ($(OS),IOS)
+
+$(eval $(call gb_Library_add_cxxflags,cairocanvas,\
+    $(gb_OBJCXXFLAGS) \
+))
+
+endif
+
 $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
 	sal \
 	cppu \
@@ -104,20 +112,16 @@ $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
 
 else
 
-ifeq ($(OS),MACOSX)
+ifneq (,$(filter MACOSX IOS,$(OS)))
 $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_quartz_cairo \
 ))
-
-
-else
-
+else ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_xlib_cairo \
 ))
 
 # freetype? fontconfig? -> test on Solaris
-ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
 	X11 \
 	Xrender \
@@ -126,6 +130,4 @@ endif
 
 endif
 
-endif
-
 # vim: set noet sw=4 ts=4: