Rename WinRT files to UWP

4 files changed, 10 insertions, 10 deletions

diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
index 87652a3ddf..5a5b87df50 100644
--- a/modules/freetype/SCsub
+++ b/modules/freetype/SCsub
@@ -55,8 +55,8 @@ if (env['builtin_freetype'] != 'no'):
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
     # Include header for WinRT to fix build issues
-    if "platform" in env and env["platform"] == "winrt":
-        env.Append(CCFLAGS=['/FI', '"modules/freetype/winrtdef.h"'])
+    if "platform" in env and env["platform"] == "uwp":
+        env.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"'])
 
     env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"])
 
diff --git a/modules/freetype/winrtdef.h b/modules/freetype/uwpdef.h
index 69c6baf532..c7dce80461 100644
--- a/modules/freetype/winrtdef.h
+++ b/modules/freetype/uwpdef.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  winrtdef.h                                                           */
+/*  uwpdef.h                                                             */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub
index ccd90d1534..e379570c72 100644
--- a/modules/openssl/SCsub
+++ b/modules/openssl/SCsub
@@ -648,8 +648,8 @@ if (env['builtin_openssl'] != 'no'):
         "crypto/bn/bn_asm.c",
     ]
 
-    if "platform" in env and env["platform"] == "winrt":
-        thirdparty_sources += ['winrt.cpp']
+    if "platform" in env and env["platform"] == "uwp":
+        thirdparty_sources += ['uwp.cpp']
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
@@ -680,7 +680,7 @@ env_openssl.add_source_files(env.modules_sources, "*.cpp")
 env_openssl.add_source_files(env.modules_sources, "*.c")
 
 # platform/winrt need to know openssl is available, pass to main env
-if "platform" in env and env["platform"] == "winrt":
+if "platform" in env and env["platform"] == "uwp":
     env.Append(CPPPATH=[thirdparty_dir])
     env.Append(CPPFLAGS=['-DOPENSSL_ENABLED'])
 
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub
index a7eca29c05..365cabd072 100644
--- a/modules/webm/libvpx/SCsub
+++ b/modules/webm/libvpx/SCsub
@@ -257,7 +257,7 @@ cpu_bits = env["bits"]
 osx_fat = (env["platform"] == 'osx' and cpu_bits == 'fat')
 webm_cpu_x86 = False
 webm_cpu_arm = False
-if env["platform"] == 'winrt':
+if env["platform"] == 'uwp':
     if 'arm' in env["PROGSUFFIX"]:
         webm_cpu_arm = True
     else:
@@ -306,7 +306,7 @@ if webm_cpu_x86:
         env_libvpx["ASFLAGS"] = '-I' + libvpx_dir[1:]
         env_libvpx["ASCOM"] = '$AS $ASFLAGS $TARGET $SOURCES'
     else:
-        if env["platform"] == 'windows' or env["platform"] == 'winrt':
+        if env["platform"] == 'windows' or env["platform"] == 'uwp':
             env_libvpx["ASFORMAT"] = 'win'
         elif env["platform"] == 'osx':
             env_libvpx["ASFORMAT"] = 'macho'
@@ -332,7 +332,7 @@ if webm_cpu_arm:
         env_libvpx["ASFLAGS"] = '-arch armv7'
     elif env["platform"] == 'android':
         env_libvpx["ASFLAGS"] = '-mfpu=neon'
-    elif env["platform"] == 'winrt':
+    elif env["platform"] == 'uwp':
         env_libvpx["AS"] = 'armasm'
         env_libvpx["ASFLAGS"] = ''
         env_libvpx["ASCOM"] = '$AS $ASFLAGS -o $TARGET $SOURCES'
@@ -382,7 +382,7 @@ elif webm_cpu_arm:
         env_libvpx_neon.Append(CCFLAGS=['-mfpu=neon'])
     env_libvpx_neon.add_source_files(env.modules_sources, libvpx_sources_arm_neon)
 
-    if env["platform"] == 'winrt':
+    if env["platform"] == 'uwp':
         env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_armasm_ms)
     elif env["platform"] == 'iphone':
         env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_gas_apple)