]> git.saurik.com Git - wxWidgets.git/commitdiff
Move oleacc.lib from the VC++ projects/makefiles to libraries.h
authorMichael Wetherell <mike.wetherell@ntlworld.com>
Sat, 21 Jan 2006 22:50:46 +0000 (22:50 +0000)
committerMichael Wetherell <mike.wetherell@ntlworld.com>
Sat, 21 Jan 2006 22:50:46 +0000 (22:50 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

build/bakefiles/common.bkl
include/wx/msw/libraries.h

index 890518e2332a93ca4d80127a7a765c9f7355c448..12f5010975a0d5dbc2c767f19dc0e4e72349dd08 100644 (file)
@@ -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'">
index 20805529d037e34ee072070a4b01f39df7527304..9173fe812593920aaf66420b99376f15a71e7762 100644 (file)
@@ -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_ */