Enable Windows Phone 8.1 project generation

Change-Id: Iab44f6d634bdcd01348aa49de28b96c3b6086df7
Reviewed-on: https://chromium-review.googlesource.com/241945
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Austin Kinross <aukinros@microsoft.com>

generate_winrt_projects.py

@@ -36,4 +36,5 @@ def generateProjects(generation_dir, build_winphone):
 
 if __name__ == '__main__':
     # Generate Windows 8.1 projects
-    generateProjects("winrt/windows", False);
+    generateProjects("winrt/8.1/windows", False);
+    generateProjects("winrt/8.1/windowsphone", True);

include/EGL/eglplatform.h

@@ -76,11 +76,11 @@
 typedef HDC     EGLNativeDisplayType;
 typedef HBITMAP EGLNativePixmapType;
 
-#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PC_APP /* Windows Store */
+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) /* Windows Desktop */
+typedef HWND    EGLNativeWindowType;
+#else /* Windows Store */
 #include <inspectable.h>
 typedef IInspectable* EGLNativeWindowType;
-#else
-typedef HWND    EGLNativeWindowType;
 #endif
 
 #elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */

src/common/platform.h

@@ -34,9 +34,6 @@
 #endif
 
 #ifdef ANGLE_PLATFORM_WINDOWS
-#   if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PC_APP
-#       define ANGLE_ENABLE_WINDOWS_STORE 1
-#   endif
 #   ifndef STRICT
 #       define STRICT 1
 #   endif
@@ -49,6 +46,10 @@
 
 #   include <windows.h>
 
+#   if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
+#       define ANGLE_ENABLE_WINDOWS_STORE 1
+#   endif
+
 #   if defined(ANGLE_ENABLE_D3D9)
 #       include <d3d9.h>
 #       include <d3dcompiler.h>