godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename WINRT_ENABLED to UWP_ENABLED

Browse Source
This commit is contained in:
George Marques 2016-11-02 18:57:35 -02:00
parent fb5a73a39f
commit b113c7b7a3
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
17 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/unix/ip_unix.cpp
View File

@ -40,7 +40,7 @@
#ifndef AI_V4MAPPED #ifndef AI_V4MAPPED
#define AI_V4MAPPED 0x00000800 #define AI_V4MAPPED 0x00000800
#endif #endif
#ifdef WINRT_ENABLED #ifdef UWP_ENABLED
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock2.h> #include <winsock2.h>
#include <windows.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(WINDOWS_ENABLED)
#if defined(WINRT_ENABLED) #if defined(UWP_ENABLED)
void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const { void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const {

2
drivers/unix/socket_helpers.h
View File

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

2
drivers/windows/dir_access_windows.cpp
View File

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

2
drivers/windows/file_access_windows.cpp
View File

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

2
drivers/windows/mutex_windows.cpp
View File

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

2
drivers/windows/semaphore_windows.cpp
View File

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

2
drivers/windows/shell_windows.cpp
View File

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

2
drivers/windows/thread_windows.cpp
View File

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

2
main/input_default.cpp
View File

@ -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,", "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 #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,", "__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 #endif
NULL NULL

2
platform/uwp/detect.py
View File

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

2
platform/uwp/thread_uwp.h
View File

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

6
thirdparty/enet/win32.c vendored
View File

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

10
thirdparty/openssl/crypto/rand/rand_win.c vendored
View File

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

2
thirdparty/openssl/openssl/dtls1.h vendored
View File

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

4
thirdparty/openssl/uwp.cpp vendored
View File

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

12
thirdparty/openssl/uwp_fix.patch vendored
View File

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

2
thirdparty/rtaudio/RtAudio.h vendored
View File

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