diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-17 11:43:33 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-17 11:43:33 +0000 |
| commit | ba82291b86392744a175c3087374192ab152d64d (patch) | |
| tree | 8b02c7996e3d2c83876819fd5447c1a70e89ede6 /extensions | |
| parent | 4d060e53b5c3351f4573b84822776fda623597b4 (diff) | |
INTEGRATION: CWS fwkbugfix03 (1.7.172); FILE MERGED
2004/10/26 05:15:01 as 1.7.172.2: RESYNC: (1.7-1.8); FILE MERGED
2004/09/23 15:48:30 mav 1.7.172.1: #i32557# the activex control can not be compiled by .NET 2003 Toolkit
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index 68df3a0d0c6c..a06a0d44fa9d 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2004-10-11 13:49:41 $ +# last change: $Author: obo $ $Date: 2004-11-17 12:43:33 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -70,7 +70,7 @@ use_shl_versions= .INCLUDE : settings.mk -.IF "$(GUI)" == "WNT" +.IF "$(GUI)" == "WNT" && "$(NETTOOLKIT)"=="" VERSIONOBJ= LIBTARGET=NO |