X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7121be53c73b6ece3b09559e142cd7f71d1961a1..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/include/wx/msw/wince/libraries.h

diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h
index 953e356b84..efda4d697b 100644
--- a/include/wx/msw/wince/libraries.h
+++ b/include/wx/msw/wince/libraries.h
@@ -22,30 +22,29 @@
 //     including libraries in project files.
 
 #if defined(__VISUALC__) && defined(__WXWINCE__)
+
 #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
 
-#if (_WIN32_WCE >= 400) && !defined(wxNO_RTTI)
+// 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(__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")
 #else
     #error "Unknown SDK, please fill-in missing pieces"
 #endif