fixes for __WINCE_NET__ build (slightly modified patch 1892654)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h
index 22e5347fdfd9be837cf1182fb5859e3b2ca20e37..fb3699064333d4a4af2a1fc8d8b11de689be6f98 100644 (file)
--- a/include/wx/msw/wince/libraries.h
+++ b/include/wx/msw/wince/libraries.h
@@ -30,26 +30,21 @@
 #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