mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it build for iOS again

Browse Source
This commit is contained in:
Tor Lillqvist
2011-07-26 00:28:43 +03:00
parent 3bf120e8ac
commit d7352b5788
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
canvas/Library_cairocanvas.mk
View File

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