Changeset 5210 for pjproject/branches/projects/uwp/pjlib/include/pj/config.h

Timestamp:

Dec 10, 2015 1:58:38 AM (8 years ago)

Author:

riza

Message:

Re #1900: Initial implementation with pjsua cli/telnet sample app.

File:

• pjproject/branches/projects/uwp/pjlib/include/pj/config.h (modified) (2 diffs)

pjproject/branches/projects/uwp/pjlib/include/pj/config.h

@@ -77 +77 @@
 #   define PJ_WIN32 1
 
+#elif defined(PJ_WIN32_WINPHONE8) || defined(_WIN32_WINPHONE8)
+    /*
+     * Windows Phone 8
+     */
+#   undef PJ_WIN32_WINPHONE8
+#   define PJ_WIN32_WINPHONE8   1
+#   include <pj/compat/os_winphone8.h>
+
+    /* Also define Win32 */
+#   define PJ_WIN32 1
+
+#elif defined(PJ_WIN32_UWP) || defined(_WIN32_UWP)
+    /*
+     * Windows UWP
+     */
+#   undef PJ_WIN32_UWP
+#   define PJ_WIN32_UWP   1
+#   include <pj/compat/os_winuwp.h>
+
+    /* Define Windows phone */
+#   define PJ_WIN32_WINPHONE8 1
+
+    /* Also define Win32 */
+#   define PJ_WIN32 1
+
 #elif defined(PJ_WIN32) || defined(_WIN32) || defined(__WIN32__) || \
         defined(WIN32) || defined(PJ_WIN64) || defined(_WIN64) || \
@@ -237 +262 @@
 #   define PJ_IS_BIG_ENDIAN     1
 
-#elif defined (PJ_M_ARMV4) || defined(ARM) || defined(_ARM_) ||  \
-        defined(ARMV4) || defined(__arm__)
+#elif defined(ARM) || defined(_ARM_) ||  defined(__arm__) || defined(_M_ARM)
+#   define PJ_HAS_PENTIUM       0
     /*
      * ARM, bi-endian, so raise error if endianness is not configured
      */
-#   undef PJ_M_ARMV4
-#   define PJ_M_ARMV4           1
-#   define PJ_M_NAME            "armv4"
-#   define PJ_HAS_PENTIUM       0
 #   if !PJ_IS_LITTLE_ENDIAN && !PJ_IS_BIG_ENDIAN
 #       error Endianness must be declared for this processor
 #   endif
+#   if defined (PJ_M_ARMV7) || defined(ARMV7)
+#       undef PJ_M_ARMV7
+#       define PJ_M_ARM7                1
+#       define PJ_M_NAME                "armv7"
+#   elif defined (PJ_M_ARMV4) || defined(ARMV4)
+#       undef PJ_M_ARMV4
+#       define PJ_M_ARMV4               1
+#       define PJ_M_NAME                "armv4"
+#   endif 
 
 #elif defined (PJ_M_POWERPC) || defined(__powerpc) || defined(__powerpc__) || \