diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:18:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:18:48 +0000 |
| commit | 9e4b38576cf1b72d12e51f4d7ddf4df96268325e (patch) | |
| tree | 42c801108878258934f20fcdc2893ccb121a10d8 /scp2/source/canvas | |
| parent | d204720bd6299a6bb84e08a6246d39040f685082 (diff) | |
INTEGRATION: CWS canvas05 (1.4.408); FILE MERGED
2008/05/23 23:10:26 thb 1.4.408.6: RESYNC: (1.7-1.8); FILE MERGED
2008/04/21 07:57:01 thb 1.4.408.5: RESYNC: (1.5-1.7); FILE MERGED
2008/04/16 14:50:37 thb 1.4.408.4: dxcanvas version handling now entirely via USE_DIRECTX5
2008/02/19 13:32:09 thb 1.4.408.3: Making dx5 canvas truly optional (was a copy of dx9 canvas before)
2008/01/22 00:54:13 thb 1.4.408.2: RESYNC: (1.4-1.5); FILE MERGED
2008/01/07 22:59:59 thb 1.4.408.1: #i81092# Slightly renamed and new dx lib
Diffstat (limited to 'scp2/source/canvas')
| -rw-r--r-- | scp2/source/canvas/directxcanvas.scp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index 7561449de692..f8be02db0e02 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: directxcanvas.scp,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -31,9 +31,9 @@ #include "macros.inc" #ifdef WNT -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectXCanvas, directxcanvas.uno) -#endif - -#ifdef WNT +# ifdef USE_DIRECTX5 +SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) +# endif SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) +SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) #endif |