From dd003bd039fdd0129414b5660f470338f195477e Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 5 Jun 2007 09:59:21 +0000
Subject: INTEGRATION: CWS obo12 (1.13.6); FILE MERGED 2007/05/25 05:54:54 obo
 1.13.6.2: #i76713# link with atl Vista SDK+Prof compiler 2007/05/14 11:32:17
 obo 1.13.6.1: #i76713# support DISABLE_ATL switch

---
 embedserv/util/makefile.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'embedserv/util')

diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index 233beb2d0f40..4c0f30e97925 100755
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.13 $
+#   $Revision: 1.14 $
 #
-#   last change: $Author: vg $ $Date: 2007-03-26 14:50:31 $
+#   last change: $Author: ihi $ $Date: 2007-06-05 10:59:21 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -46,7 +46,7 @@ USE_DEFFILE=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)" == "WNT"
+.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
 
 SHL1TARGET= emser$(UPD)$(DLLPOSTFIX)
 
@@ -81,6 +81,12 @@ SHL1STDLIBS+=\
         $(ATL_LIB)$/atls.lib
 .ENDIF
 
+.IF "$(WINDOWS_VISTA_PSDK)"!=""
+SHL1STDLIBS+=\
+        $(ADVAPI32LIB)	\
+        $(ATL_LIB)$/atls.lib
+.ENDIF # "$(WINDOWS_VISTA_PSDK)"!=""
+
 
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 
-- 
cgit