diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:14 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:14 +0200 |
| commit | 75068ecaa17c9724feb06f9b8ee12ac29012beda (patch) | |
| tree | 63ca4dfc3d33f814c4ad27718c0756762b54e2d7 /cppcanvas | |
| parent | 941020379b1ea1ec7c564c21e68ea1674cda7683 (diff) | |
gnumake4: fix buildbreakers from merge
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/Library_cppcanvas.mk | 51 | ||||
| -rw-r--r-- | cppcanvas/prj/build.lst | 2 |
2 files changed, 26 insertions, 27 deletions
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 81aeb9863a45..bf1e794dc2cd 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -44,44 +44,45 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\ )) $(eval $(call gb_Library_add_linked_libs,cppcanvas,\ - tl \ - cppu \ - sal \ - vcl \ - stl \ - comphelper \ + basegfx \ canvastools \ + comphelper \ + cppu \ cppuhelper \ - basegfx \ i18nisolang1 \ + sal \ + svt \ + tl \ + vcl \ $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,cppcanvas,\ - cppcanvas/source/wrapper/vclfactory \ - cppcanvas/source/wrapper/implcolor \ - cppcanvas/source/wrapper/basegfxfactory \ - cppcanvas/source/wrapper/implcustomsprite \ - cppcanvas/source/wrapper/implspritecanvas \ - cppcanvas/source/wrapper/implsprite \ - cppcanvas/source/wrapper/implpolypolygon \ - cppcanvas/source/wrapper/implcanvas \ - cppcanvas/source/wrapper/implbitmap \ - cppcanvas/source/wrapper/implfont \ - cppcanvas/source/wrapper/impltext \ - cppcanvas/source/wrapper/implbitmapcanvas \ - cppcanvas/source/tools/tools \ - cppcanvas/source/tools/canvasgraphichelper \ - cppcanvas/source/mtfrenderer/transparencygroupaction \ + cppcanvas/source/mtfrenderer/bitmapaction \ cppcanvas/source/mtfrenderer/cachedprimitivebase \ + cppcanvas/source/mtfrenderer/emfplus \ + cppcanvas/source/mtfrenderer/implrenderer \ cppcanvas/source/mtfrenderer/lineaction \ + cppcanvas/source/mtfrenderer/mtftools \ cppcanvas/source/mtfrenderer/pointaction \ cppcanvas/source/mtfrenderer/polypolyaction \ cppcanvas/source/mtfrenderer/rendergraphicaction \ cppcanvas/source/mtfrenderer/textaction \ - cppcanvas/source/mtfrenderer/implrenderer \ - cppcanvas/source/mtfrenderer/mtftools \ - cppcanvas/source/mtfrenderer/bitmapaction \ + cppcanvas/source/mtfrenderer/transparencygroupaction \ + cppcanvas/source/tools/canvasgraphichelper \ + cppcanvas/source/tools/tools \ + cppcanvas/source/wrapper/basegfxfactory \ + cppcanvas/source/wrapper/implbitmap \ + cppcanvas/source/wrapper/implbitmapcanvas \ + cppcanvas/source/wrapper/implcanvas \ + cppcanvas/source/wrapper/implcolor \ + cppcanvas/source/wrapper/implcustomsprite \ + cppcanvas/source/wrapper/implfont \ + cppcanvas/source/wrapper/implpolypolygon \ + cppcanvas/source/wrapper/implsprite \ + cppcanvas/source/wrapper/implspritecanvas \ + cppcanvas/source/wrapper/impltext \ + cppcanvas/source/wrapper/vclfactory \ )) # vim: set noet sw=4 ts=4: diff --git a/cppcanvas/prj/build.lst b/cppcanvas/prj/build.lst index 2dfe3a2c101e..2e4230956e32 100644 --- a/cppcanvas/prj/build.lst +++ b/cppcanvas/prj/build.lst @@ -1,4 +1,2 @@ cx cppcanvas : comphelper cppuhelper offuh tools vcl basegfx canvas NULL cx cppcanvas\prj nmake - all cx_prj NULL - -cx cppcanvas\source\uno nmake - all cx_uno cx_tools cx_wrapper cx_mtfrenderer cx_util NULL |