mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2025-01-17 14:47:19 +01:00
WinRT: more "Windows RT" to "WinRT" renaming
This commit is contained in:
parent
3070086431
commit
1e78c4a5d1
@ -40,7 +40,7 @@
|
|||||||
#define SDL_MAIN_AVAILABLE
|
#define SDL_MAIN_AVAILABLE
|
||||||
|
|
||||||
#elif defined(__WINRT__)
|
#elif defined(__WINRT__)
|
||||||
/* On Windows RT, SDL provides a main function that initializes CoreApplication,
|
/* On WinRT, SDL provides a main function that initializes CoreApplication,
|
||||||
creating an instance of IFrameworkView in the process.
|
creating an instance of IFrameworkView in the process.
|
||||||
|
|
||||||
Please note that #include'ing SDL_main.h is not enough to get a main()
|
Please note that #include'ing SDL_main.h is not enough to get a main()
|
||||||
|
@ -73,7 +73,7 @@
|
|||||||
#ifdef HAVE_MATH_H
|
#ifdef HAVE_MATH_H
|
||||||
# if defined(__WINRT__)
|
# if defined(__WINRT__)
|
||||||
/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on
|
/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on
|
||||||
Windows RT. See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
|
WinRT. See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
|
||||||
for more information.
|
for more information.
|
||||||
*/
|
*/
|
||||||
# define _USE_MATH_DEFINES
|
# define _USE_MATH_DEFINES
|
||||||
|
@ -94,11 +94,11 @@ extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
|
|||||||
#endif /* __ANDROID__ */
|
#endif /* __ANDROID__ */
|
||||||
|
|
||||||
|
|
||||||
/* Platform specific functions for Windows RT */
|
/* Platform specific functions for WinRT */
|
||||||
#if defined(__WINRT__) && __WINRT__
|
#if defined(__WINRT__) && __WINRT__
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Windows RT / Windows Phone path types
|
* \brief WinRT / Windows Phone path types
|
||||||
*/
|
*/
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
@ -122,9 +122,9 @@ typedef enum
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retrieves a Windows RT defined path on the local file system
|
* \brief Retrieves a WinRT defined path on the local file system
|
||||||
*
|
*
|
||||||
* \note Documentation on most app-specific path types on Windows RT
|
* \note Documentation on most app-specific path types on WinRT
|
||||||
* can be found on MSDN, at the URL:
|
* can be found on MSDN, at the URL:
|
||||||
* http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
|
* http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
|
||||||
*
|
*
|
||||||
@ -139,9 +139,9 @@ typedef enum
|
|||||||
extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType);
|
extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retrieves a Windows RT defined path on the local file system
|
* \brief Retrieves a WinRT defined path on the local file system
|
||||||
*
|
*
|
||||||
* \note Documentation on most app-specific path types on Windows RT
|
* \note Documentation on most app-specific path types on WinRT
|
||||||
* can be found on MSDN, at the URL:
|
* can be found on MSDN, at the URL:
|
||||||
* http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
|
* http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
|
||||||
*
|
*
|
||||||
|
@ -177,7 +177,7 @@ struct SDL_SysWMinfo
|
|||||||
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
IUnknown * window; /**< The Windows RT CoreWindow */
|
IUnknown * window; /**< The WinRT CoreWindow */
|
||||||
} winrt;
|
} winrt;
|
||||||
#endif
|
#endif
|
||||||
#if defined(SDL_VIDEO_DRIVER_X11)
|
#if defined(SDL_VIDEO_DRIVER_X11)
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
/* WinRT NOTICE:
|
/* WinRT NOTICE:
|
||||||
|
|
||||||
A number of changes were warranted to SDL's XAudio2 backend in order to
|
A number of changes were warranted to SDL's XAudio2 backend in order to
|
||||||
get it compiling for Windows RT.
|
get it compiling for WinRT.
|
||||||
|
|
||||||
When compiling for WinRT, XAudio2.h requires that it be compiled in a C++
|
When compiling for WinRT, XAudio2.h requires that it be compiled in a C++
|
||||||
file, and not a straight C file. Trying to compile it as C leads to lots
|
file, and not a straight C file. Trying to compile it as C leads to lots
|
||||||
@ -57,13 +57,13 @@
|
|||||||
http://blogs.msdn.com/b/chuckw/archive/2012/04/02/xaudio2-and-windows-8-consumer-preview.aspx
|
http://blogs.msdn.com/b/chuckw/archive/2012/04/02/xaudio2-and-windows-8-consumer-preview.aspx
|
||||||
|
|
||||||
1. Windows' thread synchronization function, CreateSemaphore, was removed
|
1. Windows' thread synchronization function, CreateSemaphore, was removed
|
||||||
from Windows RT. SDL's semaphore API was substituted instead.
|
from WinRT. SDL's semaphore API was substituted instead.
|
||||||
2. The method calls, IXAudio2::GetDeviceCount and IXAudio2::GetDeviceDetails
|
2. The method calls, IXAudio2::GetDeviceCount and IXAudio2::GetDeviceDetails
|
||||||
were removed from the XAudio2 API. Microsoft is telling developers to
|
were removed from the XAudio2 API. Microsoft is telling developers to
|
||||||
use APIs in Windows::Foundation instead.
|
use APIs in Windows::Foundation instead.
|
||||||
For SDL, the missing methods were reimplemented using the APIs Microsoft
|
For SDL, the missing methods were reimplemented using the APIs Microsoft
|
||||||
said to use.
|
said to use.
|
||||||
3. CoInitialize and CoUninitialize are not available in Windows RT.
|
3. CoInitialize and CoUninitialize are not available in WinRT.
|
||||||
These calls were removed, as COM will have been initialized earlier,
|
These calls were removed, as COM will have been initialized earlier,
|
||||||
at least by the call to the WinRT app's main function
|
at least by the call to the WinRT app's main function
|
||||||
(aka 'int main(Platform::Array<Platform::String^>^)). (DLudwig:
|
(aka 'int main(Platform::Array<Platform::String^>^)). (DLudwig:
|
||||||
@ -71,7 +71,7 @@
|
|||||||
a tag of [MTAThread], which should initialize COM. My understanding
|
a tag of [MTAThread], which should initialize COM. My understanding
|
||||||
of COM is somewhat limited, and I may be incorrect here.)
|
of COM is somewhat limited, and I may be incorrect here.)
|
||||||
4. IXAudio2::CreateMasteringVoice changed its integer-based 'DeviceIndex'
|
4. IXAudio2::CreateMasteringVoice changed its integer-based 'DeviceIndex'
|
||||||
argument to a string-based one, 'szDeviceId'. In Windows RT, the
|
argument to a string-based one, 'szDeviceId'. In WinRT, the
|
||||||
string-based argument will be used.
|
string-based argument will be used.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
//
|
//
|
||||||
// Re-implementation of methods removed from XAudio2 (in Windows RT):
|
// Re-implementation of methods removed from XAudio2 (in WinRT):
|
||||||
//
|
//
|
||||||
|
|
||||||
typedef struct XAUDIO2_DEVICE_DETAILS
|
typedef struct XAUDIO2_DEVICE_DETAILS
|
||||||
|
@ -56,7 +56,7 @@ extern SDL_VideoDevice * WINRT_GlobalSDLVideoDevice;
|
|||||||
typedef int (*SDL_WinRT_MainFunction)(int, char **);
|
typedef int (*SDL_WinRT_MainFunction)(int, char **);
|
||||||
static SDL_WinRT_MainFunction SDL_WinRT_main = nullptr;
|
static SDL_WinRT_MainFunction SDL_WinRT_main = nullptr;
|
||||||
|
|
||||||
// HACK, DLudwig: record a reference to the global, Windows RT 'app'/view.
|
// HACK, DLudwig: record a reference to the global, WinRT 'app'/view.
|
||||||
// SDL/WinRT will use this throughout its code.
|
// SDL/WinRT will use this throughout its code.
|
||||||
//
|
//
|
||||||
// TODO, WinRT: consider replacing SDL_WinRTGlobalApp with something
|
// TODO, WinRT: consider replacing SDL_WinRTGlobalApp with something
|
||||||
@ -129,7 +129,7 @@ static void WINRT_SetDisplayOrientationsPreference(void *userdata, const char *n
|
|||||||
|
|
||||||
// Set the orientation/rotation preferences. Please note that this does
|
// Set the orientation/rotation preferences. Please note that this does
|
||||||
// not constitute a 100%-certain lock of a given set of possible
|
// not constitute a 100%-certain lock of a given set of possible
|
||||||
// orientations. According to Microsoft's documentation on Windows RT [1]
|
// orientations. According to Microsoft's documentation on WinRT [1]
|
||||||
// when a device is not capable of being rotated, Windows may ignore
|
// when a device is not capable of being rotated, Windows may ignore
|
||||||
// the orientation preferences, and stick to what the device is capable of
|
// the orientation preferences, and stick to what the device is capable of
|
||||||
// displaying.
|
// displaying.
|
||||||
|
@ -131,7 +131,7 @@ WINRT_InitMouse(_THIS)
|
|||||||
{
|
{
|
||||||
SDL_Mouse *mouse = SDL_GetMouse();
|
SDL_Mouse *mouse = SDL_GetMouse();
|
||||||
|
|
||||||
/* DLudwig, Dec 3, 2012: Windows RT does not currently provide APIs for
|
/* DLudwig, Dec 3, 2012: WinRT does not currently provide APIs for
|
||||||
the following features, AFAIK:
|
the following features, AFAIK:
|
||||||
- custom cursors (multiple system cursors are, however, available)
|
- custom cursors (multiple system cursors are, however, available)
|
||||||
- programmatically moveable cursors
|
- programmatically moveable cursors
|
||||||
@ -228,7 +228,7 @@ WINRT_ProcessMouseMovedEvent(SDL_Window * window, Windows::Devices::Input::Mouse
|
|||||||
//
|
//
|
||||||
// One possible workaround would be to programmatically set the cursor's
|
// One possible workaround would be to programmatically set the cursor's
|
||||||
// position to the screen's center (when SDL's relative mouse mode is enabled),
|
// position to the screen's center (when SDL's relative mouse mode is enabled),
|
||||||
// however Windows RT does not yet seem to have the ability to set the cursor's
|
// however WinRT does not yet seem to have the ability to set the cursor's
|
||||||
// position via a public API. Win32 did this via an API call, SetCursorPos,
|
// position via a public API. Win32 did this via an API call, SetCursorPos,
|
||||||
// however WinRT makes this function be private. Apps that use it won't get
|
// however WinRT makes this function be private. Apps that use it won't get
|
||||||
// approved for distribution in the Windows Store. I've yet to be able to find
|
// approved for distribution in the Windows Store. I've yet to be able to find
|
||||||
|
@ -132,7 +132,7 @@ WINRT_CreateDevice(int devindex)
|
|||||||
|
|
||||||
#define WINRTVID_DRIVER_NAME "winrt"
|
#define WINRTVID_DRIVER_NAME "winrt"
|
||||||
VideoBootStrap WINRT_bootstrap = {
|
VideoBootStrap WINRT_bootstrap = {
|
||||||
WINRTVID_DRIVER_NAME, "SDL Windows RT video driver",
|
WINRTVID_DRIVER_NAME, "SDL WinRT video driver",
|
||||||
WINRT_Available, WINRT_CreateDevice
|
WINRT_Available, WINRT_CreateDevice
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user