Rename WINRT_ENABLED to UWP_ENABLED

drivers/unix/ip_unix.cpp

@@ -40,7 +40,7 @@
   #ifndef AI_V4MAPPED
     #define AI_V4MAPPED 0x00000800
   #endif
- #ifdef WINRT_ENABLED
+ #ifdef UWP_ENABLED
   #include <ws2tcpip.h>
   #include <winsock2.h>
   #include <windows.h>
@@ -124,7 +124,7 @@ IP_Address IP_Unix::_resolve_hostname(const String& p_hostname, IP_Address::Addr
 
 #if defined(WINDOWS_ENABLED)
 
-#if defined(WINRT_ENABLED)
+#if defined(UWP_ENABLED)
 
 void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const {
 

drivers/unix/socket_helpers.h

@@ -10,7 +10,7 @@
  #endif
 #endif
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 #define in6addr_any IN6ADDR_ANY_INIT
 #endif
 

drivers/windows/dir_access_windows.cpp

@@ -349,7 +349,7 @@ DirAccessWindows::DirAccessWindows() {
 
 	drive_count=0;
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 	Windows::Storage::StorageFolder ^install_folder = Windows::ApplicationModel::Package::Current->InstalledLocation;
 	change_dir(install_folder->Path->Data());
 

drivers/windows/file_access_windows.cpp

@@ -125,7 +125,7 @@ void FileAccessWindows::close() {
 
 		bool rename_error;
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 		// WinRT has no PathFileExists, so we check attributes instead
 		DWORD fileAttr;
 

drivers/windows/mutex_windows.cpp

@@ -81,7 +81,7 @@ MutexWindows::MutexWindows() {
 #ifdef WINDOWS_USE_MUTEX
 	mutex = CreateMutex( NULL, FALSE, NULL );
 #else
-	#ifdef WINRT_ENABLED
+	#ifdef UWP_ENABLED
     InitializeCriticalSectionEx( &mutex, 0, 0 );
 	#else
 	InitializeCriticalSection( &mutex );

drivers/windows/semaphore_windows.cpp

@@ -71,7 +71,7 @@ void SemaphoreWindows::make_default() {
 
 SemaphoreWindows::SemaphoreWindows() {
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 	semaphore=CreateSemaphoreEx(
 		NULL,
 		0,

drivers/windows/shell_windows.cpp

@@ -28,7 +28,7 @@
 /*************************************************************************/
 #ifdef WINDOWS_ENABLED
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 
 // Use Launcher class on windows 8
 

drivers/windows/thread_windows.cpp

@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "thread_windows.h"
 
-#if defined(WINDOWS_ENABLED) && !defined(WINRT_ENABLED)
+#if defined(WINDOWS_ENABLED) && !defined(UWP_ENABLED)
 
 #include "os/memory.h"
 

main/input_default.cpp

@@ -739,7 +739,7 @@ static const char *s_ControllerMappings [] =
 	"c2a94d6963726f736f66742058626f78,Wireless X360 Controller,leftx:a0,lefty:a1,dpdown:b14,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:b11,lefttrigger:a2,x:b2,dpup:b13,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:b12,righttrigger:a5,b:b1,",
 	#endif
 
-	#ifdef WINRT_ENABLED
+	#ifdef UWP_ENABLED
 	"__WINRT_GAMEPAD__,Xbox Controller,a:b2,b:b3,x:b4,y:b5,start:b0,back:b1,leftstick:b12,rightstick:b13,leftshoulder:b10,rightshoulder:b11,dpup:b6,dpdown:b7,dpleft:b8,dpright:b9,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,",
 	#endif
 	NULL

platform/uwp/detect.py

@@ -139,7 +139,7 @@ def configure(env):
     env["OBJSUFFIX"] = "." + arch + env["OBJSUFFIX"]
     env["LIBSUFFIX"] = "." + arch + env["LIBSUFFIX"]
 
-    env.Append(CCFLAGS=['/DWINRT_ENABLED'])
+    env.Append(CCFLAGS=['/DUWP_ENABLED'])
     env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])
     env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
 

platform/uwp/thread_uwp.h

@@ -29,7 +29,7 @@
 #ifndef THREAD_WINRT_H
 #define THREAD_WINRT_H
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 
 #include "os/thread.h"
 

thirdparty/enet/win32.c

@@ -28,7 +28,7 @@ enet_initialize (void)
        return -1;
     }
 
-#ifndef WINRT_ENABLED
+#ifndef UWP_ENABLED
     timeBeginPeriod (1);
 #endif
 
@@ -38,14 +38,14 @@ enet_initialize (void)
 void
 enet_deinitialize (void)
 {
-#ifndef WINRT_ENABLED
+#ifndef UWP_ENABLED
     timeEndPeriod (1);
 #endif
 
     WSACleanup ();
 }
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 enet_uint32
 timeGetTime() {
 	ULONGLONG ticks = GetTickCount64();

thirdparty/openssl/crypto/rand/rand_win.c

@@ -118,7 +118,7 @@
 # ifndef _WIN32_WINNT
 #  define _WIN32_WINNT 0x0400
 # endif
-#ifndef WINRT_ENABLED
+#ifndef UWP_ENABLED
 # include <wincrypt.h>
 # include <tlhelp32.h>
 #endif
@@ -163,7 +163,7 @@ typedef struct tagCURSORINFO {
 #  define CURSOR_SHOWING     0x00000001
 # endif                         /* CURSOR_SHOWING */
 
-# if !defined(OPENSSL_SYS_WINCE) && !defined(WINRT_ENABLED)
+# if !defined(OPENSSL_SYS_WINCE) && !defined(UWP_ENABLED)
 typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR,
                                             DWORD, DWORD);
 typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *);
@@ -198,7 +198,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE);
 #  endif                        /* 1 */
 # endif                         /* !OPENSSL_SYS_WINCE */
 
-#if !defined(WINRT_ENABLED)
+#if !defined(UWP_ENABLED)
 int RAND_poll(void)
 {
     MEMORYSTATUS m;
@@ -583,7 +583,7 @@ int RAND_poll(void)
     return (1);
 }
 
-#endif // WINRT_ENABLED
+#endif // UWP_ENABLED
 
 int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -687,7 +687,7 @@ static void readtimer(void)
 
 static void readscreen(void)
 {
-# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(WINRT_ENABLED)
+# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(UWP_ENABLED)
     HDC hScrDC;                 /* screen DC */
     HBITMAP hBitmap;            /* handle for our bitmap */
     BITMAP bm;                  /* bitmap properties */

thirdparty/openssl/openssl/dtls1.h

@@ -81,7 +81,7 @@
 #   include <sys/time.h>
 #  endif
 # endif
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 #include <winsock2.h>
 #endif
 

thirdparty/openssl/uwp.cpp

@@ -44,7 +44,7 @@ int RAND_poll(void)
 	return 1;
 	}
 
-#if defined(WINRT_ENABLED)
+#if defined(UWP_ENABLED)
 extern "C"
 {
 #include<stdio.h>
@@ -152,4 +152,4 @@ extern "C"
 	void *OPENSSL_UplinkTable [26]= {0};
 } //extern C
 
-#endif /*defined(WINRT_ENABLED)*/
+#endif /*defined(UWP_ENABLED)*/

thirdparty/openssl/uwp_fix.patch

@@ -6,7 +6,7 @@ index 06670ae..70fd52a 100644
  # ifndef _WIN32_WINNT
  #  define _WIN32_WINNT 0x0400
  # endif
-+#ifndef WINRT_ENABLED
++#ifndef UWP_ENABLED
  # include <wincrypt.h>
  # include <tlhelp32.h>
 +#endif
@@ -18,7 +18,7 @@ index 06670ae..70fd52a 100644
  # endif                         /* CURSOR_SHOWING */
  
 -# if !defined(OPENSSL_SYS_WINCE)
-+# if !defined(OPENSSL_SYS_WINCE) && !defined(WINRT_ENABLED)
++# if !defined(OPENSSL_SYS_WINCE) && !defined(UWP_ENABLED)
  typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR,
                                              DWORD, DWORD);
  typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *);
@@ -26,7 +26,7 @@ index 06670ae..70fd52a 100644
  #  endif                        /* 1 */
  # endif                         /* !OPENSSL_SYS_WINCE */
  
-+#if !defined(WINRT_ENABLED)
++#if !defined(UWP_ENABLED)
  int RAND_poll(void)
  {
      MEMORYSTATUS m;
@@ -34,7 +34,7 @@ index 06670ae..70fd52a 100644
      return (1);
  }
  
-+#endif // WINRT_ENABLED
++#endif // UWP_ENABLED
 +
  int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
  {
@@ -44,7 +44,7 @@ index 06670ae..70fd52a 100644
  static void readscreen(void)
  {
 -# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN)
-+# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(WINRT_ENABLED)
++# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(UWP_ENABLED)
      HDC hScrDC;                 /* screen DC */
      HBITMAP hBitmap;            /* handle for our bitmap */
      BITMAP bm;                  /* bitmap properties */
@@ -56,7 +56,7 @@ index 64ad3c8..a58aca2 100644
  #   include <sys/time.h>
  #  endif
  # endif
-+#ifdef WINRT_ENABLED
++#ifdef UWP_ENABLED
 +#include <winsock2.h>
 +#endif
  

thirdparty/rtaudio/RtAudio.h

@@ -7,7 +7,7 @@
 #elif defined(UNIX_ENABLED)
     #define __LINUX_ALSA__
 #elif defined(WINDOWS_ENABLED)
-    #if defined(WINRT_ENABLED)
+    #if defined(UWP_ENABLED)
         #define __RTAUDIO_DUMMY__
     #else
         #define __WINDOWS_DS__