openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409497 - in /incubator/ooo/branches/gbuild/main: ./ canvas/ canvas/inc/canvas/ canvas/inc/canvas/base/ canvas/inc/canvas/rendering/ canvas/prj/ canvas/source/factory/ canvas/source/tools/ postprocess/packcomponents/ solenv/gbuild/platform/
Date Wed, 14 Nov 2012 22:49:10 GMT
Author: arist
Date: Wed Nov 14 22:48:57 2012
New Revision: 1409497

URL: http://svn.apache.org/viewvc?rev=1409497&view=rev
Log:
gnumake4_012_5ea303c03901.patch
# HG changeset patch
# User mba
# Date 1298649084 -3600
# Node ID 5ea303c039011f673a04c13cba1c8d0884bce386
# Parent 2b5e055392f1138665daf39afb34cc1347e65d82
CWS gnumake4: convert canvas to new build system


Added:
    incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_canvasfactory.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_nullcanvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_simplecanvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Makefile
    incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk
    incubator/ooo/branches/gbuild/main/canvas/Package_inc.mk
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h
Modified:
    incubator/ooo/branches/gbuild/main/Module_ooo.mk
    incubator/ooo/branches/gbuild/main/Repository.mk
    incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/cachedprimitivebase.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastools.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/elapsedtime.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/parametricpolypolygon.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/prioritybooster.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/propertysethelper.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/spriteredrawmanager.hxx
    incubator/ooo/branches/gbuild/main/canvas/inc/canvas/verifyinput.hxx
    incubator/ooo/branches/gbuild/main/canvas/prj/d.lst
    incubator/ooo/branches/gbuild/main/canvas/source/factory/cf_service.cxx
    incubator/ooo/branches/gbuild/main/canvas/source/tools/makefile.mk
    incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
    incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
    incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk

Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:48:57 2012
@@ -24,6 +24,7 @@
 $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
+	canvas \
 	comphelper \
 	drawinglayer \
 	editeng \

Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 22:48:57 2012
@@ -40,9 +40,10 @@ $(eval $(call gb_Helper_register_executa
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     AppleRemote \
+	agg \
 	avmedia \
-	basegfx \
 	basebmp \
+	basegfx \
 	canvastools \
 	cppcanvas \
 	cui \
@@ -125,11 +126,19 @@ $(eval $(call gb_Helper_register_librari
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+	cairocanvas \
+	canvasfactory \
+	directx5canvas \
+	directx9canvas \
 	fsstorage \
+	gdipluscanvas \
 	hatchwindowfactory \
+	nullcanvas \
 	passwordcontainer \
+	simplecanvas \
 	vbaswobj \
     msforms \
+	vclcanvas \
 	writerfilter_debug \
 ))
 

Modified: incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryFixes.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryFixes.mk Wed Nov 14 22:48:57 2012
@@ -86,6 +86,7 @@ gb_Library_NOILIBFILENAMES:=\
 	icuuc \
 	sot \
 	uwinapi \
+	winmm \
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -93,6 +94,7 @@ gb_Library_FILENAMES += $(foreach lib,$(
 gb_Library_ILIBFILENAMES:=\
 	gdiplus \
 	uuid \
+	winmm \
 
 gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
@@ -135,6 +137,9 @@ gb_Library_FILENAMES := $(patsubst stl:i
 endif
 gb_Library_NOILIBFILENAMES:=\
 	advapi32 \
+	d3d9 \
+	d3dx \
+	ddraw \
 	gdi32 \
 	gdiplus \
 	gnu_getopt \
@@ -278,4 +283,9 @@ ifeq ($(SYSTEM_ICU),YES)
 gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
 endif
 
+ifeq ($(SYSTEM_CAIRO),YES)
+gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS))
+endif
+
 # vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,145 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,cairocanvas))
+
+$(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas))
+
+$(eval $(call gb_Library_add_api,cairocanvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,cairocanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,cairocanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,cairocanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+ifeq ($(SYSTEM_CAIRO),YES)
+# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
+# $(CAIRO_CFLAGS) currently not set; taking usr/include directly
+$(eval $(call gb_Library_set_include,cairocanvas,\
+	$$(INCLUDE) \
+	$(FREETYPE_CFLAGS) \
+	-I/usr/include \
+))
+else
+$(eval $(call gb_Library_set_include,cairocanvas,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/cairo \
+	$(FREETYPE_CFLAGS) \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	vcl \
+	tk \
+	tl \
+	i18nisolang1 \
+	canvastools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_cachedbitmap \
+	canvas/source/cairo/cairo_cairo \
+	canvas/source/cairo/cairo_canvas \
+	canvas/source/cairo/cairo_canvasbitmap \
+	canvas/source/cairo/cairo_canvascustomsprite \
+	canvas/source/cairo/cairo_canvasfont \
+	canvas/source/cairo/cairo_canvashelper \
+	canvas/source/cairo/cairo_canvashelper_text \
+	canvas/source/cairo/cairo_devicehelper \
+	canvas/source/cairo/cairo_services \
+	canvas/source/cairo/cairo_spritecanvas \
+	canvas/source/cairo/cairo_spritecanvashelper \
+	canvas/source/cairo/cairo_spritedevicehelper \
+	canvas/source/cairo/cairo_spritehelper \
+	canvas/source/cairo/cairo_textlayout \
+))
+
+
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_win32_cairo \
+))
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	cairo \
+	gdi32 \
+	msimg32 \
+))
+
+else
+
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	cairo \
+	pixman-1 \
+))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_quartz_cairo \
+))
+
+#CFLAGSCXX+=$(OBJCXXFLAGS)
+
+else
+
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_xlib_cairo \
+))
+
+# freetype? fontconfig? -> test on Solaris
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	X11 \
+	Xrender \
+))
+
+endif
+
+endif
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_canvasfactory.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_canvasfactory.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_canvasfactory.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_canvasfactory.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,59 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,canvasfactory))
+
+$(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory))
+
+$(eval $(call gb_Library_add_api,canvasfactory,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,canvasfactory,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,canvasfactory,\
+	$$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
+	sal \
+	stl \
+	cppu \
+	cppuhelper \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,canvasfactory,\
+	canvas/source/factory/cf_service \
+))
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,116 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,canvastools))
+
+$(eval $(call gb_Library_add_package_headers,canvastools,canvas_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,canvastools,$(SRCDIR)/canvas/inc/pch/precompiled_canvas))
+
+$(eval $(call gb_Library_add_api,canvastools,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,canvastools,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DCANVASTOOLS_DLLIMPLEMENTATION \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+ifneq ($(strip $(PROFILER)$(profiler)),)
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DPROFILER \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,canvastools,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	vcl \
+	tk \
+	tl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,canvastools,\
+	canvas/source/tools/cachedprimitivebase \
+	canvas/source/tools/canvascustomspritehelper \
+	canvas/source/tools/canvastools \
+	canvas/source/tools/elapsedtime \
+	canvas/source/tools/page \
+	canvas/source/tools/pagemanager \
+	canvas/source/tools/parametricpolypolygon \
+	canvas/source/tools/prioritybooster \
+	canvas/source/tools/propertysethelper \
+	canvas/source/tools/spriteredrawmanager \
+	canvas/source/tools/surface \
+	canvas/source/tools/surfaceproxy \
+	canvas/source/tools/surfaceproxymanager \
+	canvas/source/tools/verifyinput \
+))
+
+ifeq ($(strip $(ENABLE_AGG)),YES) 
+$(eval $(call gb_Library_add_exception_objects,canvastools,\
+	canvas/source/tools/bitmap \
+	canvas/source/tools/image \
+))
+$(eval $(call gb_Library_add_linked_libs,canvastools,\
+	agg \
+))
+ifneq ($(strip $(AGG_VERSION)),) 
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DAGG_VERSION=$(AGG_VERSION) \
+))
+endif
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,canvastools,\
+	winmm \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,114 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,directx5canvas))
+
+$(eval $(call gb_Library_set_componentfile,directx5canvas,canvas/source/directx/directx5canvas))
+
+$(eval $(call gb_Library_add_api,directx5canvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,directx5canvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,directx5canvas,\
+	$$(DEFS) \
+	-DDIRECTX_VERSION=0x0500 \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,directx5canvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+	cppu \
+	tk \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+	tl \
+	utl \
+	i18nisolang1 \
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+	user32 \
+	gdi32 \
+	gdiplus \
+	ddraw \
+))
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+what is $(DIRECTXSDK_LIB)/d3dx.lib now? \
+))
+else
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+	d3dx \
+))
+endif
+endif
+
+$(eval $(call gb_Library_add_exception_objects,directx5canvas,\
+	canvas/source/directx/dx_5rm \
+	canvas/source/directx/dx_bitmap \
+	canvas/source/directx/dx_bitmapcanvashelper \
+	canvas/source/directx/dx_canvasbitmap \
+	canvas/source/directx/dx_canvascustomsprite \
+	canvas/source/directx/dx_canvasfont \
+	canvas/source/directx/dx_canvashelper \
+	canvas/source/directx/dx_canvashelper_texturefill \
+	canvas/source/directx/dx_config \
+	canvas/source/directx/dx_devicehelper \
+	canvas/source/directx/dx_gdiplususer \
+	canvas/source/directx/dx_impltools \
+	canvas/source/directx/dx_linepolypolygon \
+	canvas/source/directx/dx_spritecanvas \
+	canvas/source/directx/dx_spritecanvashelper \
+	canvas/source/directx/dx_spritedevicehelper \
+	canvas/source/directx/dx_spritehelper \
+	canvas/source/directx/dx_surfacebitmap \
+	canvas/source/directx/dx_surfacegraphics \
+	canvas/source/directx/dx_textlayout \
+	canvas/source/directx/dx_textlayout_drawhelper \
+	canvas/source/directx/dx_vcltools \
+))
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,114 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,directx9canvas))
+
+$(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/directx9canvas))
+
+$(eval $(call gb_Library_add_api,directx9canvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,directx9canvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,directx9canvas,\
+	$$(DEFS) \
+	-DDIRECTX_VERSION=0x0900 \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,directx9canvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+	cppu \
+	tk \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+	tl \
+	utl \
+	i18nisolang1 \
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+	user32 \
+	gdi32 \
+	gdiplus \
+	ddraw \
+))
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+what is $(DIRECTXSDK_LIB)/d3d9.lib now? \
+))
+else
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+	d3d9 \
+))
+endif
+endif
+
+$(eval $(call gb_Library_add_exception_objects,directx9canvas,\
+	canvas/source/directx/dx_9rm \
+	canvas/source/directx/dx_bitmap \
+	canvas/source/directx/dx_bitmapcanvashelper \
+	canvas/source/directx/dx_canvasbitmap \
+	canvas/source/directx/dx_canvascustomsprite \
+	canvas/source/directx/dx_canvasfont \
+	canvas/source/directx/dx_canvashelper \
+	canvas/source/directx/dx_canvashelper_texturefill \
+	canvas/source/directx/dx_config \
+	canvas/source/directx/dx_devicehelper \
+	canvas/source/directx/dx_gdiplususer \
+	canvas/source/directx/dx_impltools \
+	canvas/source/directx/dx_linepolypolygon \
+	canvas/source/directx/dx_spritecanvas \
+	canvas/source/directx/dx_spritecanvashelper \
+	canvas/source/directx/dx_spritedevicehelper \
+	canvas/source/directx/dx_spritehelper \
+	canvas/source/directx/dx_surfacebitmap \
+	canvas/source/directx/dx_surfacegraphics \
+	canvas/source/directx/dx_textlayout \
+	canvas/source/directx/dx_textlayout_drawhelper \
+	canvas/source/directx/dx_vcltools \
+))
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,96 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,gdipluscanvas))
+
+$(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/gdipluscanvas))
+
+$(eval $(call gb_Library_add_api,gdipluscanvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,gdipluscanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,gdipluscanvas,\
+	$$(DEFS) \
+	-DDIRECTX_VERSION=0x0900 \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,gdipluscanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
+	cppu \
+	tk \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+	tl \
+	utl \
+	i18nisolang1 \
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
+	user32 \
+	gdi32 \
+	gdiplus \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,gdipluscanvas,\
+	canvas/source/directx/dx_bitmap \
+	canvas/source/directx/dx_bitmapcanvashelper \
+	canvas/source/directx/dx_canvas \
+	canvas/source/directx/dx_canvasbitmap \
+	canvas/source/directx/dx_canvasfont \
+	canvas/source/directx/dx_canvashelper \
+	canvas/source/directx/dx_canvashelper_texturefill \
+	canvas/source/directx/dx_devicehelper \
+	canvas/source/directx/dx_gdiplususer \
+	canvas/source/directx/dx_impltools \
+	canvas/source/directx/dx_linepolypolygon \
+	canvas/source/directx/dx_textlayout \
+	canvas/source/directx/dx_textlayout_drawhelper \
+	canvas/source/directx/dx_vcltools \
+))
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_nullcanvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_nullcanvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_nullcanvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_nullcanvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,76 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,nullcanvas))
+
+$(eval $(call gb_Library_add_api,nullcanvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,nullcanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,nullcanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,nullcanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,nullcanvas,\
+	cppu \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,nullcanvas,\
+	canvas/source/null/null_canvasbitmap \
+	canvas/source/null/null_canvascustomsprite \
+	canvas/source/null/null_canvasfont \
+	canvas/source/null/null_canvashelper \
+	canvas/source/null/null_devicehelper \
+	canvas/source/null/null_spritecanvas \
+	canvas/source/null/null_spritecanvashelper \
+	canvas/source/null/null_spritehelper \
+	canvas/source/null/null_textlayout \
+))
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_simplecanvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_simplecanvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_simplecanvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_simplecanvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,simplecanvas))
+
+$(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanvas/simplecanvas))
+
+$(eval $(call gb_Library_add_api,simplecanvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,simplecanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,simplecanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,simplecanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,simplecanvas,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	canvastools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,simplecanvas,\
+	canvas/source/simplecanvas/simplecanvasimpl \
+))
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,103 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclcanvas))
+
+$(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
+
+$(eval $(call gb_Library_add_api,vclcanvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,vclcanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_set_defs,vclcanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,vclcanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,vclcanvas,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	vcl \
+	tk \
+	tl \
+	svt \
+	i18nisolang1 \
+	canvastools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
+	canvas/source/vcl/backbuffer \
+	canvas/source/vcl/bitmapbackbuffer \
+	canvas/source/vcl/cachedbitmap \
+	canvas/source/vcl/canvas \
+	canvas/source/vcl/canvasbitmap \
+	canvas/source/vcl/canvasbitmaphelper \
+	canvas/source/vcl/canvascustomsprite \
+	canvas/source/vcl/canvasfont \
+	canvas/source/vcl/canvashelper \
+	canvas/source/vcl/devicehelper \
+	canvas/source/vcl/impltools \
+	canvas/source/vcl/services \
+	canvas/source/vcl/spritecanvas \
+	canvas/source/vcl/spritecanvashelper \
+	canvas/source/vcl/spritedevicehelper \
+	canvas/source/vcl/spritehelper \
+	canvas/source/vcl/textlayout \
+	canvas/source/vcl/windowoutdevholder \
+))
+
+# Solaris Sparc with Sun Compiler: noopt
+ifneq ($(strip($OS)),SOLARIS)
+$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
+	canvas/source/vcl/canvashelper_texturefill \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\
+	canvas/source/vcl/canvashelper_texturefill \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Makefile?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Makefile Wed Nov 14 22:48:57 2012
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,canvas))
+
+$(eval $(call gb_Module_add_targets,canvas,\
+	Library_canvastools \
+	Library_nullcanvas \
+	Library_simplecanvas \
+	Library_vclcanvas \
+	Library_canvasfactory \
+	Package_inc \
+))
+
+ifeq ($(strip $(OS)),WNT)
+ifneq ($(strip $(ENABLE_DIRECTX)),)
+
+# currently not supported
+#ifneq ($(strip $(USE_DIRECTX5)),)
+#$(eval $(call gb_Module_add_targets,canvas,\
+#	Library_directx5canvas \
+#))
+#endif
+
+$(eval $(call gb_Module_add_targets,canvas,\
+	Library_directx9canvas \
+	Library_gdipluscanvas \
+))
+
+endif
+endif
+
+ifneq ($(strip $(ENABLE_CAIRO)),)
+$(eval $(call gb_Module_add_targets,canvas,\
+	Library_cairocanvas \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

Added: incubator/ooo/branches/gbuild/main/canvas/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Package_inc.mk?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/canvas/Package_inc.mk Wed Nov 14 22:48:57 2012
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,canvas_inc,$(SRCDIR)/canvas/inc))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/basemutexhelper.hxx,canvas/base/basemutexhelper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bitmapcanvasbase.hxx,canvas/base/bitmapcanvasbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bufferedgraphicdevicebase.hxx,canvas/base/bufferedgraphicdevicebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/cachedprimitivebase.hxx,canvas/base/cachedprimitivebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvasbase.hxx,canvas/base/canvasbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritebase.hxx,canvas/base/canvascustomspritebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritehelper.hxx,canvas/base/canvascustomspritehelper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/doublebitmapbase.hxx,canvas/base/doublebitmapbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/floatbitmapbase.hxx,canvas/base/floatbitmapbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/graphicdevicebase.hxx,canvas/base/graphicdevicebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/integerbitmapbase.hxx,canvas/base/integerbitmapbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/sprite.hxx,canvas/base/sprite.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritecanvasbase.hxx,canvas/base/spritecanvasbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritesurface.hxx,canvas/base/spritesurface.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastools.hxx,canvas/canvastools.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastoolsdllapi.h,canvas/canvastoolsdllapi.h))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/debug.hxx,canvas/debug.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/elapsedtime.hxx,canvas/elapsedtime.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/parametricpolypolygon.hxx,canvas/parametricpolypolygon.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/prioritybooster.hxx,canvas/prioritybooster.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/propertysethelper.hxx,canvas/propertysethelper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/bitmap.hxx,canvas/rendering/bitmap.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icachedprimitive.hxx,canvas/rendering/icachedprimitive.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icolorbuffer.hxx,canvas/rendering/icolorbuffer.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/irendermodule.hxx,canvas/rendering/irendermodule.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurface.hxx,canvas/rendering/isurface.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxy.hxx,canvas/rendering/isurfaceproxy.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxymanager.hxx,canvas/rendering/isurfaceproxymanager.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/spriteredrawmanager.hxx,canvas/spriteredrawmanager.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/vclwrapper.hxx,canvas/vclwrapper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verbosetrace.hxx,canvas/verbosetrace.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verifyinput.hxx,canvas/verifyinput.hxx))
+
+
+# vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/cachedprimitivebase.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/cachedprimitivebase.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/cachedprimitivebase.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/cachedprimitivebase.hxx Wed Nov 14 22:48:57 2012
@@ -32,6 +32,7 @@
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
+#include <canvas/canvastoolsdllapi.h>
 
 /* Definition of CachedPrimitiveBase class */
 
@@ -43,7 +44,7 @@ namespace canvas
     /** Base class, providing common functionality for implementers of
         the XCachedPrimitive interface.
      */
-    class CachedPrimitiveBase : public CachedPrimitiveBase_Base,
+    class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase : public CachedPrimitiveBase_Base,
                                 public ::comphelper::OBaseMutex
     {
     public:

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx Wed Nov 14 22:48:57 2012
@@ -31,7 +31,7 @@
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <canvas/base/spritesurface.hxx>
-
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -40,7 +40,7 @@ namespace canvas
     /** Base class for an XSprite helper implementation - to be used
         in concert with CanvasCustomSpriteBase
      */
-    class CanvasCustomSpriteHelper
+    class CANVASTOOLS_DLLPUBLIC CanvasCustomSpriteHelper
     {
     public:
         CanvasCustomSpriteHelper();

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastools.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastools.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastools.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastools.hxx Wed Nov 14 22:48:57 2012
@@ -38,6 +38,7 @@
 #include <limits>
 #include <algorithm>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace basegfx
 {
@@ -149,56 +150,56 @@ namespace canvas
 
         /** Create a RealSize2D with both coordinate values set to +infinity
          */
-        ::com::sun::star::geometry::RealSize2D createInfiniteSize2D();
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::RealSize2D createInfiniteSize2D();
 
 
         // View- and RenderState utilities
         // ===================================================================
 
-        ::com::sun::star::rendering::RenderState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& 
         	initRenderState( ::com::sun::star::rendering::RenderState&						renderState );
 
-        ::com::sun::star::rendering::ViewState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& 
         	initViewState( ::com::sun::star::rendering::ViewState&							viewState );
 
-        ::basegfx::B2DHomMatrix& 
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& 
 	        getViewStateTransform( ::basegfx::B2DHomMatrix&									transform,
                                    const ::com::sun::star::rendering::ViewState&			viewState );
         
-        ::com::sun::star::rendering::ViewState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
         	setViewStateTransform( ::com::sun::star::rendering::ViewState& 					viewState,
                                    const ::basegfx::B2DHomMatrix&							transform );
         
-        ::basegfx::B2DHomMatrix& 
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& 
         	getRenderStateTransform( ::basegfx::B2DHomMatrix&								transform,
                                      const ::com::sun::star::rendering::RenderState&		renderState );
         
-        ::com::sun::star::rendering::RenderState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& 
         	setRenderStateTransform( ::com::sun::star::rendering::RenderState& 				renderState,
                                      const ::basegfx::B2DHomMatrix&							transform );
         
-        ::com::sun::star::rendering::ViewState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& 
         	appendToViewState( ::com::sun::star::rendering::ViewState&						viewState,
                                const ::basegfx::B2DHomMatrix&								transform );
         
-        ::com::sun::star::rendering::RenderState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& 
         	appendToRenderState( ::com::sun::star::rendering::RenderState&					renderState,
                                  const ::basegfx::B2DHomMatrix&								transform );
         
-        ::com::sun::star::rendering::ViewState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& 
         	prependToViewState( ::com::sun::star::rendering::ViewState&						viewState,
                                 const ::basegfx::B2DHomMatrix&								transform );
         
-        ::com::sun::star::rendering::RenderState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& 
         	prependToRenderState( ::com::sun::star::rendering::RenderState&					renderState,
                                   const ::basegfx::B2DHomMatrix&							transform );
 
-        ::basegfx::B2DHomMatrix& 
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& 
         	mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix&							transform,
                                          const ::com::sun::star::rendering::ViewState&		viewState,
                                          const ::com::sun::star::rendering::RenderState&	renderState );
 
-        ::com::sun::star::rendering::ViewState& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& 
 	        mergeViewAndRenderState( ::com::sun::star::rendering::ViewState&				resultViewState,
                                      const ::com::sun::star::rendering::ViewState&			viewState,
                                      const ::com::sun::star::rendering::RenderState&		renderState,
@@ -209,10 +210,10 @@ namespace canvas
         // Matrix utilities
         // ===================================================================
 
-        ::com::sun::star::geometry::AffineMatrix2D& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& 
         	setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D&	matrix );
 
-        ::com::sun::star::geometry::Matrix2D& 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& 
         	setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D&			    matrix );
 
 
@@ -238,7 +239,7 @@ namespace canvas
 
             @return a reference to the resulting rectangle
          */
-        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&			o_Rect,
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&			o_Rect,
                                                         const ::basegfx::B2DRange&		i_Rect,
                                                         const ::basegfx::B2DHomMatrix&	i_Transformation );
 
@@ -278,7 +279,7 @@ namespace canvas
 
             @see calcTransformedRectBounds()
         */
-        ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&			o_transform,
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&			o_transform,
                                                           const ::basegfx::B2DRange&		i_destRect,
                                                           const ::basegfx::B2DRange&		i_srcRect,
                                                           const ::basegfx::B2DHomMatrix&	i_transformation );
@@ -310,7 +311,7 @@ namespace canvas
             @see calcRectToRectTransform()
             @see calcTransformedRectBounds()
         */
-        ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&		o_transform,
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&		o_transform,
                                                             const ::basegfx::B2DRange&		i_srcRect,
                                                             const ::basegfx::B2DHomMatrix&	i_transformation );
         
@@ -334,7 +335,7 @@ namespace canvas
             @param rTransformation
             This transformation is applied to rTransformRect
          */
-		bool isInside( const ::basegfx::B2DRange& 		rContainedRect,
+		CANVASTOOLS_DLLPUBLIC bool isInside( const ::basegfx::B2DRange& 		rContainedRect,
                        const ::basegfx::B2DRange& 		rTransformRect, 
                        const ::basegfx::B2DHomMatrix&	rTransformation );
 
@@ -361,7 +362,7 @@ namespace canvas
 
             @return false, if the resulting scroll area is empty
          */
-        bool clipScrollArea( ::basegfx::B2IRange&                  io_rSourceArea,
+        CANVASTOOLS_DLLPUBLIC bool clipScrollArea( ::basegfx::B2IRange&                  io_rSourceArea,
                              ::basegfx::B2IPoint&                  io_rDestPoint,
                              ::std::vector< ::basegfx::B2IRange >& o_ClippedAreas,
                              const ::basegfx::B2IRange&            rBounds );
@@ -389,7 +390,7 @@ namespace canvas
             @return false, if the resulting blit is empty, i.e. fully
             clipped away.
          */
-        bool clipBlit( ::basegfx::B2IRange&       io_rSourceArea,
+        CANVASTOOLS_DLLPUBLIC bool clipBlit( ::basegfx::B2IRange&       io_rSourceArea,
                        ::basegfx::B2IPoint&       io_rDestPoint,
                        const ::basegfx::B2IRange& rSourceBounds,
                        const ::basegfx::B2IRange& rDestBounds );
@@ -409,7 +410,7 @@ namespace canvas
             @return the integer range, which is covered by the sprite
             given by rRange.
          */
-        ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange );
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange );
 
         /** Retrieve various internal properties of the actual canvas implementation.
 			
@@ -429,7 +430,7 @@ namespace canvas
 
             @return A reference to the resulting sequence of parameters
 		*/
-		::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( 
+		CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( 
 			const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas,
 			::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams );
 
@@ -438,21 +439,21 @@ namespace canvas
             Use this method for dead-simple bitmap implementations,
             that map all their formats to 8888 RGBA color.
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace();
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace();
 
         /** Return a memory layout for a default RGBA integer format
 
             Use this method for dead-simple bitmap implementations,
             that map all their formats to 8888 RGBA color.
          */
-        ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( 
             const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize );
 
         /// Convert standard 8888 RGBA color to vcl color
-        ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor );
+        CANVASTOOLS_DLLPUBLIC ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor );
 
         /// Convert standard 8888 RGBA color to vcl color
-        ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor );
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor );
 
         // Modeled closely after boost::numeric_cast, only that we
         // issue some trace output here and throw a RuntimeException
@@ -485,13 +486,13 @@ namespace canvas
             return static_cast<Target>(arg);
         }
 
-        ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( 
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( 
             const ::com::sun::star::awt::Rectangle&                                    rRect,
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin  );
 
         /** Retrieve for small bound marks around each corner of the given rectangle
          */
-        ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange );
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange );
 
         /** Calculate number of gradient "strips" to generate (takes
            into account device resolution)
@@ -500,7 +501,7 @@ namespace canvas
            Maximal integer difference between all color stops, needed
            for smooth gradient color differences
          */
-        int calcGradientStepCount( ::basegfx::B2DHomMatrix&                        rTotalTransform,
+        CANVASTOOLS_DLLPUBLIC int calcGradientStepCount( ::basegfx::B2DHomMatrix&                        rTotalTransform,
                                    const ::com::sun::star::rendering::ViewState&   viewState, 
                                    const ::com::sun::star::rendering::RenderState& renderState,
                                    const ::com::sun::star::rendering::Texture&     texture,

Added: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h?rev=1409497&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h (added)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h Wed Nov 14 22:48:57 2012
@@ -0,0 +1,37 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef INCLUDED_CANVASTOOLSDLLAPI_H
+#define  INCLUDED_CANVASTOOLSDLLAPI_H
+
+#if defined CANVASTOOLS_DLLIMPLEMENTATION
+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
\ No newline at end of file

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/elapsedtime.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/elapsedtime.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/elapsedtime.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/elapsedtime.hxx Wed Nov 14 22:48:57 2012
@@ -27,6 +27,7 @@
 #include <sal/types.h>
 
 #include "boost/shared_ptr.hpp"
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -38,7 +39,7 @@ namespace canvas
         	-management functions. In its simplest use-case, it
         	measures the time from its creation.
          */
-        class ElapsedTime
+        class CANVASTOOLS_DLLPUBLIC ElapsedTime
         {
         public:
             /** Create a new ElapsedTime object

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/parametricpolypolygon.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/parametricpolypolygon.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/parametricpolypolygon.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/parametricpolypolygon.hxx Wed Nov 14 22:48:57 2012
@@ -32,6 +32,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 #include <boost/utility.hpp>
+#include <canvas/canvastoolsdllapi.h>
 
 namespace basegfx
 {
@@ -47,7 +48,7 @@ namespace canvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XParametricPolyPolygon2D,
             		   			  		      ::com::sun::star::lang::XServiceInfo > ParametricPolyPolygon_Base;
 
-    class ParametricPolyPolygon : public ::comphelper::OBaseMutex, 
+    class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex, 
                                   public ParametricPolyPolygon_Base,
 							      private ::boost::noncopyable
     {

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/prioritybooster.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/prioritybooster.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/prioritybooster.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/prioritybooster.hxx Wed Nov 14 22:48:57 2012
@@ -27,6 +27,7 @@
 #include <sal/types.h>
 
 #include <memory>
+#include <canvas/canvastoolsdllapi.h>
 
 
 namespace canvas
@@ -47,8 +48,8 @@ namespace canvas
                 Difference in execution priority. Positive values
                 increase prio, negative values decrease prio.
              */
-            explicit PriorityBooster( sal_Int32 nDelta );
-            ~PriorityBooster();
+             CANVASTOOLS_DLLPUBLIC explicit PriorityBooster( sal_Int32 nDelta );
+             CANVASTOOLS_DLLPUBLIC ~PriorityBooster();
 
         private:
             // also disables copy constructor and assignment operator

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/propertysethelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/propertysethelper.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/propertysethelper.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/propertysethelper.hxx Wed Nov 14 22:48:57 2012
@@ -32,6 +32,7 @@
 #include <vector>
 #include <memory>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -50,7 +51,7 @@ namespace canvas
         The core responsibility of this this class is the name/value
         mapping for property sets.
      */
-    class PropertySetHelper
+    class CANVASTOOLS_DLLPUBLIC PropertySetHelper
     {
     public:
         typedef boost::function0< ::com::sun::star::uno::Any >            GetterType;

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx Wed Nov 14 22:48:57 2012
@@ -29,6 +29,7 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -69,7 +70,7 @@ namespace canvas
 
     /** Create a surface proxy for the given render module.
      */
-	ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule );
+	CANVASTOOLS_DLLPUBLIC ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule );
 }
 
 #endif /* INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX */

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/spriteredrawmanager.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/spriteredrawmanager.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/spriteredrawmanager.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/spriteredrawmanager.hxx Wed Nov 14 22:48:57 2012
@@ -39,6 +39,7 @@
 #include <boost/utility.hpp>
 #include <boost/bind.hpp>
 
+#include <canvas/canvastoolsdllapi.h>
 
 /* Definition of SpriteRedrawManager class */
 
@@ -62,7 +63,7 @@ namespace canvas
         there) will reside in a common sprite area and handled
         together in the forEachSpriteArea functor call. 
      */
-    class SpriteRedrawManager : private ::boost::noncopyable
+    class CANVASTOOLS_DLLPUBLIC SpriteRedrawManager : private ::boost::noncopyable
     {
     public:
         /** Data container for the connected components list

Modified: incubator/ooo/branches/gbuild/main/canvas/inc/canvas/verifyinput.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/inc/canvas/verifyinput.hxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/verifyinput.hxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/inc/canvas/verifyinput.hxx Wed Nov 14 22:48:57 2012
@@ -34,6 +34,7 @@
 #include <boost/bind.hpp>
 #include <boost/current_function.hpp>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace geometry 
 {
@@ -91,7 +92,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D&	rMatrix,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D&	rMatrix,
                           const char*										pStr,
                           const ::com::sun::star::uno::Reference< 
                           	::com::sun::star::uno::XInterface >&			xIf,
@@ -114,7 +115,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::Matrix2D&	rMatrix,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::Matrix2D&	rMatrix,
                           const char*									pStr,
                           const ::com::sun::star::uno::Reference< 
                           	::com::sun::star::uno::XInterface >&		xIf,
@@ -137,7 +138,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&	rPoint,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D&	rPoint,
                           const char*										pStr,
                           const ::com::sun::star::uno::Reference< 
                           	::com::sun::star::uno::XInterface >&			xIf,
@@ -160,7 +161,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealSize2D&	rSize,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealSize2D&	rSize,
                           const char*									pStr,
                           const ::com::sun::star::uno::Reference< 
                           	::com::sun::star::uno::XInterface >&		xIf,
@@ -183,7 +184,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D&	rSegment,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D&	rSegment,
                           const char*												pStr,
                           const ::com::sun::star::uno::Reference< 
                           	::com::sun::star::uno::XInterface >&					xIf,
@@ -206,7 +207,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&	rPoint,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D&	rPoint,
                           const char*										pStr,
                           const ::com::sun::star::uno::Reference< 
                           	::com::sun::star::uno::XInterface >&			xIf,
@@ -229,7 +230,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealRectangle2D&	rRect,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealRectangle2D&	rRect,
                           const char*											pStr,
                           const ::com::sun::star::uno::Reference< 
                           	::com::sun::star::uno::XInterface >&				xIf,
@@ -251,7 +252,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::ViewState&	viewState, 
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::ViewState&	viewState, 
                           const char*									pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&	xIf,
@@ -277,7 +278,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::RenderState&	renderState, 
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::RenderState&	renderState, 
                           const char*										pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&		xIf,
@@ -300,7 +301,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::StrokeAttributes&	strokeAttributes,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::StrokeAttributes&	strokeAttributes,
                           const char*											pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&			xIf,
@@ -322,7 +323,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::Texture& 	texture,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::Texture& 	texture,
                           const char*									pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&	xIf,
@@ -344,7 +345,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& 	bitmapLayout,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& 	bitmapLayout,
                           const char*												pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&				xIf,
@@ -366,7 +367,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
                           const char*													pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&					xIf,
@@ -388,7 +389,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FontInfo&	fontInfo,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontInfo&	fontInfo,
                           const char*									pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&	xIf,
@@ -410,7 +411,7 @@ namespace canvas
 
 			@throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FontRequest&	fontRequest,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontRequest&	fontRequest,
                           const char*										pStr,
                           const ::com::sun::star::uno::Reference< 
                                	::com::sun::star::uno::XInterface >&		xIf,
@@ -673,7 +674,7 @@ namespace canvas
             @param size
             Given rectangle must be within ((0,0), (size.Width, size.Height))
          */
-        void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect,
+        CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect,
                                const ::com::sun::star::geometry::IntegerSize2D& 	 size );
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
@@ -685,7 +686,7 @@ namespace canvas
             @param size
             Given position must be within ((0,0), (size.Width, size.Height))
          */
-        void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos,
+        CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos,
                                const ::com::sun::star::geometry::IntegerSize2D&  size );
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
@@ -694,7 +695,7 @@ namespace canvas
             @param size
             Size to verify
          */
-	    void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size,
+	    CANVASTOOLS_DLLPUBLIC void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size,
                                const char*										pStr,
                                const ::com::sun::star::uno::Reference< 
 		                               ::com::sun::star::uno::XInterface >&		xIf );
@@ -705,7 +706,7 @@ namespace canvas
             @param size
             Size to verify
          */
-	    void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size,
+	    CANVASTOOLS_DLLPUBLIC void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size,
                                const char*									 pStr,
                                const ::com::sun::star::uno::Reference< 
 		                               ::com::sun::star::uno::XInterface >&  xIf );

Modified: incubator/ooo/branches/gbuild/main/canvas/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/prj/d.lst?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/canvas/prj/d.lst Wed Nov 14 22:48:57 2012
@@ -26,6 +26,7 @@ mkdir: %_DEST%\inc%_EXT%\canvas\renderin
 
 mkdir: %_DEST%\inc%_EXT%\canvas
 ..\inc\canvas\*.hxx %_DEST%\inc%_EXT%\canvas\*.hxx
+..\inc\canvas\*.h %_DEST%\inc%_EXT%\canvas\*.h
 ..\%__SRC%\misc\canvasfactory.component %_DEST%\xml%_EXT%\canvasfactory.component
 ..\%__SRC%\misc\directx5canvas.component %_DEST%\xml%_EXT%\directx5canvas.component
 ..\%__SRC%\misc\directx9canvas.component %_DEST%\xml%_EXT%\directx9canvas.component

Modified: incubator/ooo/branches/gbuild/main/canvas/source/factory/cf_service.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/source/factory/cf_service.cxx?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/source/factory/cf_service.cxx (original)
+++ incubator/ooo/branches/gbuild/main/canvas/source/factory/cf_service.cxx Wed Nov 14 22:48:57 2012
@@ -522,13 +522,13 @@ const ::cppu::ImplementationEntry s_entr
 
 extern "C" {
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     sal_Char const * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
     registry::XRegistryKey * pRegistryKey )

Modified: incubator/ooo/branches/gbuild/main/canvas/source/tools/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/source/tools/makefile.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/source/tools/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/canvas/source/tools/makefile.mk Wed Nov 14 22:48:57 2012
@@ -26,6 +26,7 @@ PRJ=..$/..
 PRJNAME=canvas
 TARGET=canvastools
 ENABLE_EXCEPTIONS=TRUE
+LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------------
 
@@ -40,10 +41,23 @@ CDEFS+= -DVERBOSE
 CDEFS+= -DPROFILER
 .ENDIF
 
+CDEFS+= -DCANVASTOOLS_DLLIMPLEMENTATION
+
 #CFLAGS +:= /Ox /Ot					# THIS IS IMPORTANT
 
 
 .IF "$(L10N_framework)"==""
+
+SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
+SHL1IMPLIB= 	i$(TARGET)
+SHL1STDLIBS=	$(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB)
+.IF "$(GUI)" == "WNT"
+SHL1STDLIBS += $(WINMMLIB) $(KERNEL32LIB)
+.ENDIF
+SHL1USE_EXPORTS=name
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+DEF1NAME	=$(SHL1TARGET)
+
 SLOFILES =	\
 	$(SLO)$/cachedprimitivebase.obj \
 	$(SLO)$/canvascustomspritehelper.obj \
@@ -60,28 +74,11 @@ SLOFILES =	\
 	$(SLO)$/page.obj \
 	$(SLO)$/verifyinput.obj
 
-SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= 	i$(TARGET)
-SHL1STDLIBS=	$(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB)
+SHL1OBJS=	$(SLOFILES)
 
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME	=$(SHL1TARGET)
-DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt \
-		$(LIB1TARGET)
-
-DEF1DES		=Canvastools
-DEFLIB1NAME	=$(TARGET)
-
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS += $(WINMMLIB) $(KERNEL32LIB)
-.ENDIF
 .ENDIF
 
 # ==========================================================================
 
 .INCLUDE :	target.mk
 
-$(MISC)$/$(SHL1TARGET).flt : makefile.mk $(TARGET).flt
-	@$(TYPE) $(TARGET).flt > $@

Modified: incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk Wed Nov 14 22:48:57 2012
@@ -45,11 +45,13 @@ my_components = \
     bib \
     cached1 \
     calc \
-    canvasfactory \
     chartcontroller \
     chartmodel \
     charttools \
     chartview \
+    component/canvas/source/factory/canvasfactory \
+    component/canvas/source/simplecanvas/simplecanvas \
+    component/canvas/source/vcl/vclcanvas \
     component/comphelper/util/comphelp \
     component/cui/util/cui \
     component/drawinglayer/drawinglayer \
@@ -144,7 +146,6 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
-    simplecanvas \
     slideshow \
     spl \
     srtrs1 \
@@ -168,7 +169,6 @@ my_components = \
     uui \
     vbaevents \
     vbaobj \
-    vclcanvas \
     xcr \
     xmlfa \
     xmlfd \
@@ -220,7 +220,7 @@ my_components += emboleobj
 .END
 
 .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
-my_components += cairocanvas
+my_components += component/canvas/source/cairo/cairocanvas
 .END
 
 .IF "$(ENABLE_GCONF)" != ""
@@ -331,12 +331,12 @@ my_components += \
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
 my_components += \
     avmediawin \
-    directx9canvas \
+    component/canvas/source/directx/directx9canvas \
     gdipluscanvas
 .END
 
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
-my_components += directx5canvas
+my_components += component/canvas/source/directx/directx5canvas
 .END
 
 .IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \

Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Wed Nov 14 22:48:57 2012
@@ -279,6 +279,10 @@ gb_Library_UNOEXT := .uno$(gb_Library_PL
 endif
 
 gb_Library_PLAINLIBS_NONE += \
+	cairo \
+	fontconfig \
+	Xrender \
+	pixman-1 \
 	dl \
 	freetype \
 	jpeg \

Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 22:48:57 2012
@@ -457,6 +457,9 @@ gb_Library_PLAINEXT := .lib
 
 gb_Library_PLAINLIBS_NONE += \
 	advapi32 \
+	d3d9 \
+	d3dx \
+	ddraw \
 	gdi32 \
 	gdiplus \
 	gnu_getopt \
@@ -472,6 +475,7 @@ gb_Library_PLAINLIBS_NONE += \
 	user32 \
 	uuid \
 	uwinapi \
+	winmm \
 	winspool \
 	z \
 	cppunit

Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409497&r1=1409496&r2=1409497&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed Nov 14 22:48:57 2012
@@ -496,6 +496,7 @@ gb_Library_PLAINLIBS_NONE += \
 	user32 \
 	uuid \
 	uwinapi \
+	winmm \
 	winspool \
 	z \
 	cppunit



Mime
View raw message