X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9928e9d1ab76fd26557e2cf8e6715402639e999..68fe70ea1f131471b82747ee2759dba7a19a0c23:/include/wx/msw/wince/libraries.h?ds=inline diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h index e597eb7694..efda4d697b 100644 --- a/include/wx/msw/wince/libraries.h +++ b/include/wx/msw/wince/libraries.h @@ -12,8 +12,8 @@ #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, +// 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 @@ -21,29 +21,34 @@ // VC++'s #pragma to link against the libraries conditionally, instead of // including libraries in project files. -#ifdef __VISUALC__ +#if defined(__VISUALC__) && defined(__WXWINCE__) -#if _WIN32_WCE >= 400 +#if (_WIN32_WCE >= 400) || defined(__POCKETPC__) + // No commdlg.lib in Mobile 5.0 Smartphone +#if !(defined(__SMARTPHONE__) && _WIN32_WCE >= 1200) #pragma comment(lib,"commdlg.lib") #endif +#endif + +// this library is only available for PocketPC targets using recent SDK and is +// needed for RTTI support +#if (_WIN32_WCE >= 400) && !defined(__WINCE_NET__) && !defined(wxNO_RTTI) + #pragma comment(lib,"ccrtrtti.lib") +#endif #if defined(__WINCE_STANDARDSDK__) // DoDragDrop: #pragma comment(lib,"olece400.lib") -#elif defined(__POCKETPC__) - // PocketPC build: - // DoDragDrop: +#elif defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WINCE_NET__) #pragma comment(lib,"ceshell.lib") - #pragma comment(lib,"aygshell.lib") -#elif defined(__SMARTPHONE__) - // Smartphone build: +#elif defined(__HANDHELDPC__) + // Handheld PC builds. Maybe WindowsCE.NET 4.X needs another symbol. #pragma comment(lib,"ceshell.lib") - #pragma comment(lib,"aygshell.lib") #else #error "Unknown SDK, please fill-in missing pieces" #endif -#endif // __VISUALC__ +#endif // __VISUALC__ && __WXWINCE__ #endif // _WX_LIBRARIES_H_