diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 10:03:21 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 10:03:21 +0000 |
| commit | 7075d62a15abb5b7427135302f74a01940e8ea83 (patch) | |
| tree | e5eb45bda46100e92c2475a6847e3caadd554805 /scp2 | |
| parent | c9fbf663458d29c6af687f32354de939496d6352 (diff) | |
INTEGRATION: CWS obo12 (1.50.4); FILE MERGED
2007/05/30 12:45:30 obo 1.50.4.2: RESYNC: (1.50-1.51); FILE MERGED
2007/05/23 13:09:47 obo 1.50.4.1: #i76713# Windows Vista PSDK DISABLE_ATL, DISABLE_ADO
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 46813829d732..a4aa0e206e43 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.53 $ +# $Revision: 1.54 $ # -# last change: $Author: vg $ $Date: 2007-05-25 15:22:49 $ +# last change: $Author: ihi $ $Date: 2007-06-05 11:03:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -214,6 +214,16 @@ SCPDEFS+=-DDISABLE_NEON SCPDEFS+=-DENABLE_VBA .ENDIF +.IF "$(DISABLE_ATL)"!="" +SCPDEFS+=-DDISABLE_ATL +.ENDIF + +# ADO can't be build with Windows Vista SDK and 2005 Express Edition +# due to missing header, 2005 Professional Edition contains these header +.IF "$(PROF_EDITION)"=="" && "$(WINDOWS_VISTA_PSDK)"!="" +SCPDEFS+=-DDISABLE_ADO +.ENDIF + SCP_PRODUCT_TYPE=osl ICUVERSION_DEPENDENT_FILES= \ @@ -275,4 +285,4 @@ ULFFILES= \ $(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk .ENDIF -$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk +$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk
\ No newline at end of file |