Rename WinRT files to UWP

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"])
 

modules/freetype/uwpdef.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  winrtdef.h                                                           */
+/*  uwpdef.h                                                             */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */

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'])
 

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)

platform/uwp/SCsub

@@ -3,15 +3,15 @@
 Import('env')
 
 files = [
-    'thread_winrt.cpp',
+    'thread_uwp.cpp',
     '#platform/windows/tcp_server_winsock.cpp',
     '#platform/windows/packet_peer_udp_winsock.cpp',
     '#platform/windows/stream_peer_winsock.cpp',
     '#platform/windows/key_mapping_win.cpp',
-    'joystick_winrt.cpp',
+    'joystick_uwp.cpp',
     'gl_context_egl.cpp',
     'app.cpp',
-    'os_winrt.cpp',
+    'os_uwp.cpp',
 ]
 
 if "build_angle" in env and env["build_angle"]:

platform/uwp/app.h

@@ -32,7 +32,7 @@
 
 #include <wrl.h>
 
-#include "os_winrt.h"
+#include "os_uwp.h"
 #include "GLES2/gl2.h"
 
 namespace GodotWinRT

platform/uwp/detect.py

@@ -42,7 +42,7 @@ def configure(env):
     if(env["bits"] != "default"):
         print "Error: bits argument is disabled for MSVC"
         print ("Bits argument is not supported for MSVC compilation. Architecture depends on the Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings)"
-               + " that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=winrt) and SCons will attempt to detect what MSVC compiler"
+               + " that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=uwp) and SCons will attempt to detect what MSVC compiler"
                + " will be executed and inform you.")
         sys.exit()
 
@@ -104,7 +104,7 @@ def configure(env):
             env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/amd64'])
             env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_x64/lib'])
 
-    env.Append(CPPPATH=['#platform/winrt', '#drivers/windows'])
+    env.Append(CPPPATH=['#platform/uwp', '#drivers/windows'])
     env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', '/WINMD', '/APPCONTAINER', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1', '/NODEFAULTLIB:"kernel32.lib"', '/NODEFAULTLIB:"ole32.lib"'])
     env.Append(CPPFLAGS=['/D', '__WRL_NO_DEFAULT_LIB__', '/D', 'WIN32'])
     env.Append(CPPFLAGS=['/FU', os.environ['VCINSTALLDIR'] + 'lib/store/references/platform.winmd'])

platform/uwp/export/export.cpp

@@ -71,7 +71,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "object.h"
 #include "tools/editor/editor_import_export.h"
 #include "tools/editor/editor_node.h"
-#include "platform/winrt/logo.h"
+#include "platform/uwp/logo.h"
 #include "os/file_access.h"
 #include "io/zip.h"
 #include "io/unzip.h"
@@ -2339,7 +2339,7 @@ Error EditorExportPlatformWinrt::export_project(const String & p_path, bool p_de
 
 EditorExportPlatformWinrt::EditorExportPlatformWinrt() {
 
-	Image img(_winrt_logo);
+	Image img(_uwp_logo);
 	logo = Ref<ImageTexture>(memnew(ImageTexture));
 	logo->create_from_image(img);
 
@@ -2384,7 +2384,7 @@ EditorExportPlatformWinrt::EditorExportPlatformWinrt() {
 EditorExportPlatformWinrt::~EditorExportPlatformWinrt() {}
 
 
-void register_winrt_exporter() {
+void register_uwp_exporter() {
 
 	Ref<EditorExportPlatformWinrt> exporter = Ref<EditorExportPlatformWinrt>(memnew(EditorExportPlatformWinrt));
 	EditorImportExport::get_singleton()->add_export_platform(exporter);

platform/uwp/export/export.h

@@ -26,4 +26,4 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-void register_winrt_exporter();
+void register_uwp_exporter();

platform/uwp/joystick_uwp.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  joystick.cpp                                                         */
+/*  joystick_uwp.cpp                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "joystick_winrt.h"
+#include "joystick_uwp.h"
 
 using namespace Windows::Gaming::Input;
 using namespace Windows::Foundation;

platform/uwp/joystick_uwp.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  joystick.h                                                           */
+/*  joystick_uwp.h                                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */

platform/uwp/os_uwp.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  os_winrt.cpp                                                         */
+/*  os_uwp.cpp                                                           */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -27,10 +27,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "drivers/gles2/rasterizer_gles2.h"
-#include "os_winrt.h"
+#include "os_uwp.h"
 #include "drivers/unix/memory_pool_static_malloc.h"
 #include "os/memory_pool_dynamic_static.h"
-#include "thread_winrt.h"
+#include "thread_uwp.h"
 #include "drivers/windows/semaphore_windows.h"
 #include "drivers/windows/mutex_windows.h"
 #include "main/main.h"

platform/uwp/os_uwp.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  os_winrt.h                                                           */
+/*  os_uwp.h                                                             */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -55,7 +55,7 @@
 #include <stdio.h>
 #include "main/input_default.h"
 
-#include "joystick_winrt.h"
+#include "joystick_uwp.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>

platform/uwp/thread_uwp.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  thread_winrt.cpp                                                     */
+/*  thread_uwp.cpp                                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,7 +26,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "thread_winrt.h"
+#include "thread_uwp.h"
 
 #include "os/memory.h"
 

platform/uwp/thread_uwp.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  thread_winrt.h                                                       */
+/*  thread_uwp.h                                                         */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */