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

[Norbert Thiebaud]

 canvas/Library_cairocanvas.mk              |   13 ++++++++++++-
 canvas/source/cairo/cairo_quartz_cairo.cxx |    2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 2459afbe0bb768023abc5ee6e0aee6afcc296f42
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jul 24 15:59:38 2011 -0500

    silence unused parameter warning

diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx
index f2f29bf..7755f49 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.cxx
@@ -186,7 +186,7 @@ namespace cairo
      *
      * @return The new surface or NULL
      **/
-    void QuartzSurface::Resize( int width, int height )
+void QuartzSurface::Resize( int /* width */, int /* height */ )
     {
         OSL_FAIL("not supposed to be called!");
     }
commit 657019830023de902da5f3d0a8cc76117115d351
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jul 24 15:59:23 2011 -0500

    fix MacOS build (nedd objectiveC++ flags and Coca framework)

diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index c31a0b1..8ba70d7 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -46,6 +46,18 @@ $(eval $(call gb_Library_add_defs,cairocanvas,\
 ))
 endif
 
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Library_add_cxxflags,cairocanvas,\
+    -x objective-c++ -fobjc-exceptions\
+))
+
+$(eval $(call gb_Library_add_libs,cairocanvas,\
+    -framework Cocoa \
+))
+
+endif
+
 $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
 	sal \
 	cppu \
@@ -97,7 +109,6 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_quartz_cairo \
 ))
 
-#CFLAGSCXX+=$(OBJCXXFLAGS)
 
 else