Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

[wxWidgets.git] / include / wx / msw / wince / libraries.h

diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h
index 81c5f23881c48b04757d548fa4aeb25ae04f98e6..22e5347fdfd9be837cf1182fb5859e3b2ca20e37 100644 (file)
--- 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_
 
 #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
 //     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,22 +21,32 @@
 //     VC++'s #pragma to link against the libraries conditionally, instead of
 //     including libraries in project files.
 
 //     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
     #pragma comment(lib,"commdlg.lib")
 #endif

+#endif
+
+#if (_WIN32_WCE >= 400) && !defined(wxNO_RTTI)
+    #pragma comment(lib,"ccrtrtti.lib")
+#endif

 
 

-#if defined(WCE_PLATFORM_STANDARDSDK)
+#if defined(__WINCE_STANDARDSDK__)

     // DoDragDrop:
     #pragma comment(lib,"olece400.lib")
     // DoDragDrop:
     #pragma comment(lib,"olece400.lib")

-#elif defined(WIN32_PLATFORM_PSPC)
+#elif defined(__POCKETPC__)

     // PocketPC build:
     // DoDragDrop:
     #pragma comment(lib,"ceshell.lib")
 
     #pragma comment(lib,"aygshell.lib")
     // PocketPC build:
     // DoDragDrop:
     #pragma comment(lib,"ceshell.lib")
 
     #pragma comment(lib,"aygshell.lib")

-#elif defined(WIN32_PLATFORM_WFSP)
+#elif defined(__HANDHELDPC__)
+    // Handheld PC builds. Maybe WindowsCE.NET 4.X needs another symbol.
+    #pragma comment(lib,"ceshell.lib")
+#elif defined(__SMARTPHONE__)

     // Smartphone build:
     #pragma comment(lib,"ceshell.lib")
     #pragma comment(lib,"aygshell.lib")
     // Smartphone build:
     #pragma comment(lib,"ceshell.lib")
     #pragma comment(lib,"aygshell.lib")


@@ -44,6 +54,6 @@
     #error "Unknown SDK, please fill-in missing pieces"
 #endif
 
     #error "Unknown SDK, please fill-in missing pieces"
 #endif
 

-#endif // __VISUALC__
+#endif // __VISUALC__ && __WXWINCE__

 
 #endif // _WX_LIBRARIES_H_
 
 #endif // _WX_LIBRARIES_H_