diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-26 00:28:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-26 00:28:43 +0300 |
| commit | d7352b578864f6fa2f61e3d13aab36a283688912 (patch) | |
| tree | bdb8094f05c30c25ccd9c2ecc2044d7510499a1a /canvas | |
| parent | 3bf120e8aca0d61bba4af00f18e8aab91b308fe8 (diff) | |
Make it build for iOS again
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_cairocanvas.mk | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 424fe92df8d6..f0c89a7e36a2 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: |