diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:01:47 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:01:47 +0000 |
commit | cdd0e789225814f87d0ea12a6f1d68babd3db765 (patch) | |
tree | 34e01c23424933555047183c9b0ef2b5ba752912 /canvas | |
parent | 0c01238856527c068ccf72b5a56141e508ea4fe4 (diff) |
INTEGRATION: CWS canvas05 (1.8.44); FILE MERGED
2008/04/21 07:27:46 thb 1.8.44.2: RESYNC: (1.8-1.9); FILE MERGED
2007/12/20 22:19:00 thb 1.8.44.1: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/vcl/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/canvas/source/vcl/makefile.mk b/canvas/source/vcl/makefile.mk index d9d04ede21ae..781cd58d8b91 100644 --- a/canvas/source/vcl/makefile.mk +++ b/canvas/source/vcl/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # # This file is part of OpenOffice.org. # @@ -54,6 +54,7 @@ NOOPTFILES = $(SLO)$/canvashelper_texturefill.obj SLOFILES = $(SLO)$/backbuffer.obj \ $(SLO)$/bitmapbackbuffer.obj \ $(SLO)$/cachedbitmap.obj \ + $(SLO)$/canvas.obj \ $(SLO)$/canvasbitmap.obj \ $(SLO)$/canvasbitmaphelper.obj \ $(SLO)$/canvascustomsprite.obj \ @@ -62,10 +63,13 @@ SLOFILES = $(SLO)$/backbuffer.obj \ $(SLO)$/canvashelper_texturefill.obj \ $(SLO)$/devicehelper.obj \ $(SLO)$/impltools.obj \ + $(SLO)$/services.obj \ $(SLO)$/spritecanvas.obj \ $(SLO)$/spritecanvashelper.obj \ + $(SLO)$/spritedevicehelper.obj \ $(SLO)$/spritehelper.obj \ - $(SLO)$/textlayout.obj + $(SLO)$/textlayout.obj \ + $(SLO)$/windowoutdevholder.obj SHL1TARGET=$(TARGET).uno |