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 similarity index 97% rename from modules/freetype/winrtdef.h rename to 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) diff --git a/platform/winrt/SCsub b/platform/uwp/SCsub similarity index 87% rename from platform/winrt/SCsub rename to platform/uwp/SCsub index 5259e7dc22..430d4ef9e7 100644 --- a/platform/winrt/SCsub +++ b/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"]: diff --git a/platform/winrt/app.cpp b/platform/uwp/app.cpp similarity index 100% rename from platform/winrt/app.cpp rename to platform/uwp/app.cpp diff --git a/platform/winrt/app.h b/platform/uwp/app.h similarity index 99% rename from platform/winrt/app.h rename to platform/uwp/app.h index 652ec86e1f..91cac37985 100644 --- a/platform/winrt/app.h +++ b/platform/uwp/app.h @@ -32,7 +32,7 @@ #include -#include "os_winrt.h" +#include "os_uwp.h" #include "GLES2/gl2.h" namespace GodotWinRT diff --git a/platform/winrt/detect.py b/platform/uwp/detect.py similarity index 97% rename from platform/winrt/detect.py rename to platform/uwp/detect.py index 6a1a06d8ab..85d6d54a70 100644 --- a/platform/winrt/detect.py +++ b/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']) diff --git a/platform/winrt/export/export.cpp b/platform/uwp/export/export.cpp similarity index 99% rename from platform/winrt/export/export.cpp rename to platform/uwp/export/export.cpp index eca9f09de6..6a35c1cebc 100644 --- a/platform/winrt/export/export.cpp +++ b/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(memnew(ImageTexture)); logo->create_from_image(img); @@ -2384,7 +2384,7 @@ EditorExportPlatformWinrt::EditorExportPlatformWinrt() { EditorExportPlatformWinrt::~EditorExportPlatformWinrt() {} -void register_winrt_exporter() { +void register_uwp_exporter() { Ref exporter = Ref(memnew(EditorExportPlatformWinrt)); EditorImportExport::get_singleton()->add_export_platform(exporter); diff --git a/platform/winrt/export/export.h b/platform/uwp/export/export.h similarity index 98% rename from platform/winrt/export/export.h rename to platform/uwp/export/export.h index 278d6d23cd..f25065341d 100644 --- a/platform/winrt/export/export.h +++ b/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(); diff --git a/platform/winrt/gl_context_egl.cpp b/platform/uwp/gl_context_egl.cpp similarity index 100% rename from platform/winrt/gl_context_egl.cpp rename to platform/uwp/gl_context_egl.cpp diff --git a/platform/winrt/gl_context_egl.h b/platform/uwp/gl_context_egl.h similarity index 100% rename from platform/winrt/gl_context_egl.h rename to platform/uwp/gl_context_egl.h diff --git a/platform/winrt/joystick_winrt.cpp b/platform/uwp/joystick_uwp.cpp similarity index 98% rename from platform/winrt/joystick_winrt.cpp rename to platform/uwp/joystick_uwp.cpp index 9f93c5a26b..bcd867b14c 100644 --- a/platform/winrt/joystick_winrt.cpp +++ b/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; diff --git a/platform/winrt/joystick_winrt.h b/platform/uwp/joystick_uwp.h similarity index 97% rename from platform/winrt/joystick_winrt.h rename to platform/uwp/joystick_uwp.h index 17f9565708..0ae8b35b02 100644 --- a/platform/winrt/joystick_winrt.h +++ b/platform/uwp/joystick_uwp.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* joystick.h */ +/* joystick_uwp.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/winrt/logo.png b/platform/uwp/logo.png similarity index 100% rename from platform/winrt/logo.png rename to platform/uwp/logo.png diff --git a/platform/winrt/os_winrt.cpp b/platform/uwp/os_uwp.cpp similarity index 99% rename from platform/winrt/os_winrt.cpp rename to platform/uwp/os_uwp.cpp index 4b23f3960e..23d0a6aa9b 100644 --- a/platform/winrt/os_winrt.cpp +++ b/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" diff --git a/platform/winrt/os_winrt.h b/platform/uwp/os_uwp.h similarity index 98% rename from platform/winrt/os_winrt.h rename to platform/uwp/os_uwp.h index a4667f213d..98a3cc54cc 100644 --- a/platform/winrt/os_winrt.h +++ b/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 #include "main/input_default.h" -#include "joystick_winrt.h" +#include "joystick_uwp.h" /** @author Juan Linietsky diff --git a/platform/winrt/platform_config.h b/platform/uwp/platform_config.h similarity index 100% rename from platform/winrt/platform_config.h rename to platform/uwp/platform_config.h diff --git a/platform/winrt/thread_winrt.cpp b/platform/uwp/thread_uwp.cpp similarity index 97% rename from platform/winrt/thread_winrt.cpp rename to platform/uwp/thread_uwp.cpp index 8e3e0d5bef..5f7d1ca24b 100644 --- a/platform/winrt/thread_winrt.cpp +++ b/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" diff --git a/platform/winrt/thread_winrt.h b/platform/uwp/thread_uwp.h similarity index 97% rename from platform/winrt/thread_winrt.h rename to platform/uwp/thread_uwp.h index df275d560a..e0d386a317 100644 --- a/platform/winrt/thread_winrt.h +++ b/platform/uwp/thread_uwp.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* thread_winrt.h */ +/* thread_uwp.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/thirdparty/openssl/winrt.cpp b/thirdparty/openssl/uwp.cpp similarity index 100% rename from thirdparty/openssl/winrt.cpp rename to thirdparty/openssl/uwp.cpp diff --git a/thirdparty/openssl/winrt_fix.patch b/thirdparty/openssl/uwp_fix.patch similarity index 100% rename from thirdparty/openssl/winrt_fix.patch rename to thirdparty/openssl/uwp_fix.patch