#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
// 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
#pragma comment(lib,"commdlg.lib")
#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")
#error "Unknown SDK, please fill-in missing pieces"
#endif
-#endif // __VISUALC__
+#endif // __VISUALC__ && __WXWINCE__
#endif // _WX_LIBRARIES_H_