[Libreoffice-commits] .: Branch 'feature/gnumake4' - basegfx/CppunitTest_basegfx.mk basegfx/inc basegfx/Library_basegfx.mk basegfx/Package_inc.mk basegfx/prj basegfx/StaticLibrary_basegfx_s.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx5canvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk cppcanvas/Library_cppcanvas.mk regexp/Library_regexp.mk sax/CppunitTest_sax.mk sax/Library_expwrap.mk sax/Library_fastsax.mk sax/Library_sax.mk ucbhelper/Library_ucbhelper.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Jul 22 12:35:24 PDT 2011
basegfx/CppunitTest_basegfx.mk | 5 +++++
basegfx/Library_basegfx.mk | 16 ++++++++++------
basegfx/Package_inc.mk | 1 -
basegfx/StaticLibrary_basegfx_s.mk | 8 ++++++--
basegfx/inc/basegfx/tools/unotools.hxx | 4 ++--
basegfx/prj/build.lst | 2 +-
canvas/Library_cairocanvas.mk | 1 -
canvas/Library_canvasfactory.mk | 5 ++++-
canvas/Library_canvastools.mk | 6 +++++-
canvas/Library_directx5canvas.mk | 5 ++++-
canvas/Library_directx9canvas.mk | 1 -
canvas/Library_gdipluscanvas.mk | 6 +++++-
canvas/Library_nullcanvas.mk | 6 +++++-
canvas/Library_simplecanvas.mk | 6 +++++-
canvas/Library_vclcanvas.mk | 6 +++++-
cppcanvas/Library_cppcanvas.mk | 5 ++++-
regexp/Library_regexp.mk | 6 +++---
sax/CppunitTest_sax.mk | 7 +++----
sax/Library_expwrap.mk | 6 +++++-
sax/Library_fastsax.mk | 6 +++++-
sax/Library_sax.mk | 6 +++++-
ucbhelper/Library_ucbhelper.mk | 6 +++++-
vcl/Library_vcl.mk | 20 +++++++-------------
vcl/Library_vclplug_gen.mk | 6 +++---
24 files changed, 97 insertions(+), 49 deletions(-)
New commits:
commit 2afc074f25d71956a645fa2855e27b97f763fd5f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:07:24 2011 +0200
postmerge fixes for gnumake4
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 51cdcc6..fdac0a4 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -53,4 +53,9 @@ $(eval $(call gb_CppunitTest_set_include,basegfx_test,\
-I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_CppunitTest_add_api,basegfx_test,\
+ offapi \
+ udkapi \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index c510b5f..7390583 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -36,13 +36,17 @@ $(eval $(call gb_Library_set_include,basegfx,\
-I$(SRCDIR)/basegfx/source/inc \
-I$(SRCDIR)/basegfx/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,basegfx,\
-DBASEGFX_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,basegfx,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,basegfx,\
cppu \
cppuhelper \
@@ -51,14 +55,15 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\
))
$(eval $(call gb_Library_add_exception_objects,basegfx,\
- basegfx/source/tools/liangbarsky \
- basegfx/source/tools/debugplotter \
+ basegfx/source/tools/b2dclipstate \
basegfx/source/tools/canvastools \
+ basegfx/source/tools/debugplotter \
basegfx/source/tools/gradienttools \
basegfx/source/tools/keystoplerp \
- basegfx/source/tools/unopolypolygon \
+ basegfx/source/tools/liangbarsky \
basegfx/source/tools/tools \
- basegfx/source/tools/b2dclipstate \
+ basegfx/source/tools/unopolypolygon \
+ basegfx/source/tools/unotools \
basegfx/source/numeric/ftools \
basegfx/source/tuple/b3ituple \
basegfx/source/tuple/b3dtuple \
@@ -98,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/matrix/b3dhommatrix \
basegfx/source/matrix/b2dhommatrix \
basegfx/source/point/b3ipoint \
- basegfx/source/point/b3dhompoint \
basegfx/source/point/b2dpoint \
basegfx/source/point/b3dpoint \
basegfx/source/point/b2dhompoint \
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
index 1f8fbd6..e8d07ff 100644
--- a/basegfx/Package_inc.mk
+++ b/basegfx/Package_inc.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/pixel/bpixel.hxx,baseg
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrix.hxx,basegfx/matrix/b2dhommatrix.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b3dhommatrix.hxx,basegfx/matrix/b3dhommatrix.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrixtools.hxx,basegfx/matrix/b2dhommatrixtools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dhompoint.hxx,basegfx/point/b3dhompoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3ipoint.hxx,basegfx/point/b3ipoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dpoint.hxx,basegfx/point/b3dpoint.hxx))
$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dpoint.hxx,basegfx/point/b2dpoint.hxx))
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 36f6117..940af85 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -36,7 +36,12 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
-I$(SRCDIR)/basegfx/source/inc \
$$(INCLUDE) \
-I$(SRCDIR)/basegfx/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_api,basegfx_s,\
+ offapi \
+ udkapi \
))
# the whole library is a hack
@@ -103,7 +108,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/matrix/b3dhommatrix \
CustomTarget/basegfx/source/matrix/b2dhommatrix \
CustomTarget/basegfx/source/point/b3ipoint \
- CustomTarget/basegfx/source/point/b3dhompoint \
CustomTarget/basegfx/source/point/b2dpoint \
CustomTarget/basegfx/source/point/b3dpoint \
CustomTarget/basegfx/source/point/b2dhompoint \
diff --git a/basegfx/inc/basegfx/tools/unotools.hxx b/basegfx/inc/basegfx/tools/unotools.hxx
index e7bcc27..52e2069 100644
--- a/basegfx/inc/basegfx/tools/unotools.hxx
+++ b/basegfx/inc/basegfx/tools/unotools.hxx
@@ -44,10 +44,10 @@ class B2DPolyPolygon;
namespace unotools
{
- B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
+ BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
throw( ::com::sun::star::lang::IllegalArgumentException );
- void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
+ BASEGFX_DLLPUBLIC void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
::com::sun::star::drawing::PolyPolygonBezierCoords& rRetval );
}
}
diff --git a/basegfx/prj/build.lst b/basegfx/prj/build.lst
index ab5cf9b..fd4a0ce 100644
--- a/basegfx/prj/build.lst
+++ b/basegfx/prj/build.lst
@@ -1,3 +1,3 @@
-fx basegfx : o3tl sal offapi comphelper cppuhelper cppu CPPUNIT:cppunit NULL
+fx basegfx : o3tl sal offapi udkapi comphelper cppuhelper cppu CPPUNIT:cppunit NULL
fx basegfx\prj nmake - all fx_prj NULL
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 9fc2db0..6747bbd 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index ce02c19..fb7499c 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -33,9 +33,12 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_Library_add_api,canvasfactory,\
+ offapi \
+ udkapi \
+))
$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
cppu \
cppuhelper \
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index dc424ed..9fb6308 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,canvastools,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,canvastools,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,canvastools,\
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index 4413909..53205db 100644
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -34,9 +34,12 @@ $(eval $(call gb_Library_set_include,directx5canvas,\
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
-I$(SRCDIR)/canvas/source/directx \
- -I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_Library_add_api,directx5canvas,\
+ offapi \
+ udkapi \
+))
$(eval $(call gb_Library_add_defs,directx5canvas,\
-DDIRECTX_VERSION=0x0500 \
))
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index cb8264d..a1a08c0 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index f5b2bc3..c188059 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,gdipluscanvas,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,gdipluscanvas,\
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index e179804..4dc5994 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -31,7 +31,11 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,nullcanvas,\
+ offapi \
+ udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 5f1f2d7..b031a0a 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,simplecanvas,\
+ offapi \
+ udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 9cc7405..7141552 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,vclcanvas,\
+ offapi \
+ udkapi \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index bf1e794..87bf679 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_set_include,cppcanvas,\
-I$(SRCDIR)/cppcanvas/inc/pch \
-I$(SRCDIR)/cppcanvas/source/inc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
+$(eval $(call gb_Library_add_api,cppcanvas,\
+ offapi \
+ udkapi \
+))
$(eval $(call gb_Library_add_defs,cppcanvas,\
-DCPPCANVAS_DLLIMPLEMENTATION \
))
diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk
index 463892d..1fa02bb 100644
--- a/regexp/Library_regexp.mk
+++ b/regexp/Library_regexp.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,i18nregexp))
$(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc))
-$(eval $(call gb_Library_set_include,i18nregexp,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+$(eval $(call gb_Library_add_api,i18nregexp,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,i18nregexp,\
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index d29632d..9a292c4 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -38,9 +38,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,sax_cppunit,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+$(eval $(call gb_CppunitTest_add_api,sax_cppunit,\
+ offapi \
+ udkapi \
))
-
# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 05bddd0..5b9bd34 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap)
$(eval $(call gb_Library_set_include,expwrap,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
+$(eval $(call gb_Library_add_api,expwrap,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,expwrap,\
cppu \
cppuhelper \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 2dd9dcc..f347842 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -31,10 +31,14 @@ $(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax
$(eval $(call gb_Library_set_include,fastsax,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
+$(eval $(call gb_Library_add_api,fastsax,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,fastsax,\
cppu \
cppuhelper \
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index f3e089e..4ac6c56 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_add_package_headers,sax,\
$(eval $(call gb_Library_set_include,sax,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(SRCDIR)/sax/inc \
))
+$(eval $(call gb_Library_add_api,sax,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_defs,sax,\
-DSAX_DLLIMPLEMENTATION \
))
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index f1df847..14bf74d 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,ucbhelper,\
$$(INCLUDE) \
-I$(SRCDIR)/ucbhelper/inc \
-I$(SRCDIR)/ucbhelper/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,ucbhelper,\
-DUCBHELPER_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,ucbhelper,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,ucbhelper,\
cppu \
cppuhelper \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7ca41ba..08ccec9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -56,8 +56,7 @@ $(eval $(call gb_Library_set_include,vcl,\
-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
))
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_include,vcl,\
- $$(INCLUDE) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
@@ -200,8 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
endif
ifeq ($(GUIBASE),android)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
@@ -473,8 +471,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/components/rasterizer_rsvg \
))
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_LIBRSVG \
))
ifeq ($(SYSTEM_CAIRO),YES)
@@ -490,8 +487,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
# that point as they occur on the command line, it is pointless to
# search the cairo library at that point as no references to cairo
# entries have been read from object files yet.
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
$$(CAIRO_LIBS) \
))
@@ -515,8 +511,7 @@ endif
endif
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
$$(FONTCONFIG_LIBS) \
$$(FREETYPE_LIBS) \
))
@@ -561,7 +556,7 @@ $(eval $(call gb_Library_add_ldflags,vcl,\
))
endif
ifeq ($(COM),GCC)
-$(eval $(call gb_Library_set_ldflags,vcl,\
+$(eval $(call gb_Library_add_ldflags,vcl,\
$$(LDFLAGS) \
))
endif
@@ -585,8 +580,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
endif
ifeq ($(GUIBASE),cocoatouch)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-framework UIKit \
-framework CoreFoundation \
))
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 819d9ce..895afe2 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -67,17 +67,17 @@ $(call gb_Library_use_externals,vclplug_gen,\
icuuc \
)
-))
+ifeq ($(SYSTEM_CAIRO),YES)
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
$$(LDFLAGS) \
$$(CAIRO_LIBS) \
))
else
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vclplug_gen,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
+
$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
cairo \
))
More information about the Libreoffice-commits
mailing list