Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move oleacc.lib from the VC++ projects/makefiles to libraries.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-01-21 22:50:46 +00:00
parent aee06d92ae
commit 1b48afd23d
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/common.bkl
View File

@@ -547,7 +547,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<sys-lib>advapi32</sys-lib> <sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib> <sys-lib>wsock32</sys-lib>
</if> </if>
<if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'"> <if cond="FORMAT=='borland'">
<sys-lib>oleacc</sys-lib> <sys-lib>oleacc</sys-lib>
</if> </if>
<if cond="FORMAT!='msevc4prj'"> <if cond="FORMAT!='msevc4prj'">

37
include/wx/msw/libraries.h
View File

@@ -1,20 +1,27 @@
///////////////////////////////////////////////////////////////////////////// /*
// Name: wx/msw/libraries.h * Name: wx/msw/libraries.h
// Purpose: Pragmas for linking libs conditionally * Purpose: Pragmas for linking libs conditionally
// Author: Michael Wetherell * Author: Michael Wetherell
// Modified by: * Modified by:
// RCS-ID: $Id$ * RCS-ID: $Id$
// Copyright: (c) 2005 Michael Wetherell * Copyright: (c) 2005 Michael Wetherell
// Licence: wxWindows licence * Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// */
#ifndef _WX_MSW_LIBRARIES_H_ #ifndef _WX_MSW_LIBRARIES_H_
#define _WX_MSW_LIBRARIES_H_ #define _WX_MSW_LIBRARIES_H_
// Notes: /*
// * 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 * In general the preferred place to add libs is in the bakefiles. This file
// support a way to do that. * 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_ */