From 1b48afd23db9e8b5bfac8323c292b08f8f9f2e0e Mon Sep 17 00:00:00 2001
From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Sat, 21 Jan 2006 22:50:46 +0000
Subject: [PATCH] Move oleacc.lib from the VC++ projects/makefiles to
 libraries.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/common.bkl |  2 +-
 include/wx/msw/libraries.h | 37 ++++++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 890518e233..12f5010975 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -547,7 +547,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
             </if>
-            <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
+            <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
             <if cond="FORMAT!='msevc4prj'">
diff --git a/include/wx/msw/libraries.h b/include/wx/msw/libraries.h
index 20805529d0..9173fe8125 100644
--- a/include/wx/msw/libraries.h
+++ b/include/wx/msw/libraries.h
@@ -1,20 +1,27 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/libraries.h
-// Purpose:     Pragmas for linking libs conditionally
-// Author:      Michael Wetherell
-// Modified by:
-// RCS-ID:      $Id$
-// Copyright:   (c) 2005 Michael Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
+/*
+ * Name:        wx/msw/libraries.h
+ * Purpose:     Pragmas for linking libs conditionally
+ * Author:      Michael Wetherell
+ * Modified by:
+ * RCS-ID:      $Id$
+ * Copyright:   (c) 2005 Michael Wetherell
+ * Licence:     wxWindows licence
+ */
 
 #ifndef _WX_MSW_LIBRARIES_H_
 #define _WX_MSW_LIBRARIES_H_
 
-// Notes:
-//
-// In general the preferred place to add libs is in the bakefiles. This file
-// can be used where libs must be added conditionally, for those compilers that
-// support a way to do that.
+/*
+ * Notes:
+ *
+ * In general the preferred place to add libs is in the bakefiles. This file
+ * can be used where libs must be added conditionally, for those compilers that
+ * support a way to do that.
+ */
 
-#endif // _WX_MSW_LIBRARIES_H_
+/* VC++ 5 didn't include oleacc.lib, though it came with the PSDK */
+#if defined __VISUALC__ && (wxUSE_ACCESSIBILITY || __VISUALC__ >= 1200)
+#pragma comment(lib, "oleacc")
+#endif
+
+#endif /* _WX_MSW_LIBRARIES_H_ */
-- 
2.45.2