X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae072480721f82bda63771a4ef1d9ef278d2b1b0..ae999b11ec671b5a12a30f24c0aa6b36978b3fd6:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 601f6d2ce0..7dd47e6e0f 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -398,14 +398,19 @@
        __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)
+
+    /* wxOS2 vs. non wxOS2 ports on OS2 platform */
+#    ifndef __WXMOTIF__
+#        ifndef __WXOS2__
+#            define __WXOS2__
+#        endif
+#        ifndef __WXPM__
+#            define __WXPM__
+#        endif
+#    endif
+
 #    if defined(__IBMCPP__)
 #        define __VISAGEAVER__ __IBMCPP__
-#    endif
-#    ifndef __WXOS2__
-#        define __WXOS2__
-#    endif
-#    ifndef __WXPM__
-#        define __WXPM__
 #    endif
 
     /* Place other OS/2 compiler environment defines here */
@@ -476,6 +481,10 @@
 #    endif
 #endif
 
+#ifdef __INTEL_COMPILER
+#   define __INTELC__
+#endif
+
 /*
    We get "Large Files (ILP32) not supported in strict ANSI mode." #error
    from HP-UX standard headers when compiling with g++ without this:
@@ -484,9 +493,11 @@
 #   define __STDC_EXT__ 1
 #endif
 
-/* Force linking against required libraries under Windows CE: */
+/* Force linking against required libraries under Windows: */
 #ifdef __WXWINCE__
 #   include "wx/msw/wince/libraries.h"
+#elif defined __WINDOWS__
+#   include "wx/msw/libraries.h"
 #endif
 
 /*