diff options
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/CppunitTest_basegfx.mk | 5 | ||||
| -rw-r--r-- | basegfx/Library_basegfx.mk | 16 | ||||
| -rw-r--r-- | basegfx/Package_inc.mk | 1 | ||||
| -rw-r--r-- | basegfx/StaticLibrary_basegfx_s.mk | 8 | ||||
| -rw-r--r-- | basegfx/inc/basegfx/tools/unotools.hxx | 4 | ||||
| -rw-r--r-- | basegfx/prj/build.lst | 2 |
6 files changed, 24 insertions, 12 deletions
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 51cdcc699ae0..fdac0a4cfd4b 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 c510b5f52571..7390583e907f 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 1f8fbd63542d..e8d07ff1069d 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 36f6117a1171..940af85cbe41 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 e7bcc27fb561..52e2069075ee 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 ab5cf9bda8e4..fd4a0cec218a 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 |