diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 12:58:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 12:58:25 +0000 |
| commit | c328ef8a1ffb392db41184a7838503d9ac284070 (patch) | |
| tree | 82ca7e48896352698dda7ed01a44c78bcbba1183 /desktop | |
| parent | 7f5be656db87af65827aa9235e6eaab914017de2 (diff) | |
INTEGRATION: CWS c09tosrc (1.9.132); FILE MERGED
2007/06/29 11:57:12 vg 1.9.132.3: Disable PCH usage: dp_gui_system.cxx cannot be compiled with precompiled headers. Error: 'BOOL' redefinition, WinDef.h (line 142) and tools\solar.h (line71).
2007/06/29 08:58:58 jl 1.9.132.2: #i79001 Error string for update shared extension on Vista
2007/06/22 15:16:39 jl 1.9.132.1: #i78688# allow to manage shared extension within office
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk index a3c808521cdb..1c6bc05becc8 100644 --- a/desktop/source/deployment/gui/makefile.mk +++ b/desktop/source/deployment/gui/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: kz $ $Date: 2007-06-20 10:47:09 $ +# last change: $Author: rt $ $Date: 2007-07-06 13:58:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,8 @@ TARGET = deploymentgui ENABLE_EXCEPTIONS = TRUE #USE_DEFFILE = TRUE NO_BSYMBOLIC = TRUE +USE_PCH := +ENABLE_PCH := .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk @@ -57,7 +59,7 @@ SLOFILES = \ $(SLO)$/dp_gui_updatedialog.obj \ $(SLO)$/dp_gui_updateinstalldialog.obj \ $(SLO)$/dp_gui_autoscrolledit.obj \ - $(SLO)$/dp_gui_modifiablecontext.obj + $(SLO)$/dp_gui_system.obj SHL1TARGET = $(TARGET)$(UPD)$(DLLPOSTFIX).uno SHL1VERSIONMAP = ..$/deployment.map |