From eddb32504316bfc92624a2a9b7cc62fd4543face Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 11 Apr 2004 15:14:50 +0000 Subject: [PATCH] added wx/msw/wince/libraries.h to workaround SDK differences problems git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/files.bkl | 1 + include/wx/msw/wince/libraries.h | 38 ++++++++++++++++++++++++++++++++ include/wx/platform.h | 5 +++++ 3 files changed, 44 insertions(+) create mode 100644 include/wx/msw/wince/libraries.h diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index ace037b668..0b64179870 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1323,6 +1323,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/fdrepdlg.h wx/generic/fontdlgg.h wx/msw/wince/helpwce.h + wx/msw/wince/libraries.h wx/msw/wince/missing.h wx/msw/wince/tbarwce.h diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h new file mode 100644 index 0000000000..6c311e83f6 --- /dev/null +++ b/include/wx/msw/wince/libraries.h @@ -0,0 +1,38 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/wince/libraries.h +// Purpose: VC++ pragmas for linking against SDK libs +// Author: Vaclav Slavik +// Modified by: +// Created: 2004-04-11 +// RCS-ID: $Id$ +// Copyright: (c) 2004 Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_LIBRARIES_H_ +#define _WX_LIBRARIES_H_ + +// NB: According to Microsoft, it is up to the OEM to decide whether +// some of libraries will be included in the system or not. For example, +// MS' STANDARDSDK does not include cyshell.lib and aygshell.lib, while +// Pocket PC 2003 SDK does. We depend on some symbols that are in these +// libraries in some SDKs and in different libs in others. Fortunately we +// can detect what SDK is used in C++ code, so we take advantage of +// VC++'s #pragma to link against the libraries conditionally, instead of +// including libraries in project files. + +#ifdef __VISUALC__ + +#if defined(WCE_PLATFORM_STANDARDSDK) + // DoDragDrop: + #pragma comment(lib,"olece400.lib") +#elif defined(WIN32_PLATFORM_PSPC) + // DoDragDrop: + #pragma comment(lib,"ceshell.lib") +#else + #error "Unknown SDK, please fill-in missing pieces" +#endif + +#endif // __VISUALC__ + +#endif // _WX_LIBRARIES_H_ diff --git a/include/wx/platform.h b/include/wx/platform.h index 6085934aa8..80690215fc 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -360,6 +360,11 @@ # endif #endif +/* Force linking against required libraries under Windows CE: */ +#ifdef __WXWINCE__ +# include "wx/msw/wince/libraries.h" +#endif + /* This macro can be used to test the gcc version and can be used like this: -- 2.45.2