[Libreoffice-commits] .: extensions/source

Fridrich Strba fridrich at kemper.freedesktop.org
Thu Sep 1 03:06:16 PDT 2011


 extensions/source/activex/main/makefile.mk  |    2 +-
 extensions/source/activex/msidl/makefile.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b3e76f13909dbfeef46e74b590fab8d4f1d581b6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 1 12:05:09 2011 +0200

    Skip activex when not building with MSVC

diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index e609fe5..ea70b66 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -34,7 +34,7 @@ use_shl_versions=
 # --- Settings ----------------------------------
 .INCLUDE : settings.mk
 
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ACTIVEX)"==""
+.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"==""
 
 VERSIONOBJ=
 LIBTARGET=NO
diff --git a/extensions/source/activex/msidl/makefile.mk b/extensions/source/activex/msidl/makefile.mk
index 66c4a2a..be9103e 100644
--- a/extensions/source/activex/msidl/makefile.mk
+++ b/extensions/source/activex/msidl/makefile.mk
@@ -33,7 +33,7 @@ TARGET=msidl
 
 .INCLUDE : settings.mk
 
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ACTIVEX)"==""
+.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"==""
 
 # --- Targets ----------------------------------
 


More information about the Libreoffice-commits mailing list