diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-26 23:27:57 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 09:46:38 +0200 |
| commit | 04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (patch) | |
| tree | a9038a8c5081a246779a6d9b7fbfe0e774af725a /canvas/Module_canvas.mk | |
| parent | 47d7d1e987e1caa030c7623767d9dfe3d85eb924 (diff) | |
Make Android cross-build working
In the spirit of 12759f67a36d52a345be6002d7017551e8414c59, change
external lib's config.sub to eat the arm-unknown-linux-androideabi
host os string. Also, permit shared libs again - seems Android can
handle those.
Added dictionaries to cross-build-toolset - idxdict is needed.
Should build up to sfx2 - some residual static lib issues there,
and in raptor.
Diffstat (limited to 'canvas/Module_canvas.mk')
| -rw-r--r-- | canvas/Module_canvas.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk index 3dfc40411454..31791984a7c3 100644 --- a/canvas/Module_canvas.mk +++ b/canvas/Module_canvas.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Module_Module,canvas)) $(eval $(call gb_Module_add_targets,canvas,\ - Library_cairocanvas \ Library_canvasfactory \ Library_canvastools \ Library_nullcanvas \ @@ -38,6 +37,12 @@ $(eval $(call gb_Module_add_targets,canvas,\ Package_inc \ )) +ifeq ($(ENABLE_CAIRO_CANVAS),TRUE) +$(eval $(call gb_Module_add_targets,canvas,\ + Library_cairocanvas \ +)) +endif + ifeq ($(strip $(OS)),WNT) ifneq ($(strip $(ENABLE_DIRECTX)),) |