sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL fixes

Browse Source
This commit is contained in:
Lynix
2020-05-27 20:37:20 +02:00
parent 81f03f04e5
commit 1734b8e5db
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/scripts/modules/platform.lua
View File

@@ -16,3 +16,12 @@ MODULE.Files = {
"../src/Nazara/Platform/SDL2/**.hpp", "../src/Nazara/Platform/SDL2/**.hpp",
"../src/Nazara/Platform/SDL2/**.cpp" "../src/Nazara/Platform/SDL2/**.cpp"
} }
MODULE.OsDefines.Windows = {
"SDL_VIDEO_DRIVER_WINDOWS=1"
}
MODULE.OsDefines.Posix = {
"SDL_VIDEO_DRIVER_X11=1",
"SDL_VIDEO_DRIVER_WAYLAND=1",
}

2
src/Nazara/Platform/SDL2/WindowImpl.cpp
View File

@@ -129,7 +129,7 @@ namespace Nz
bool WindowImpl::Create(void* handle) bool WindowImpl::Create(void* handle)
{ {
m_handle = SDL_CreateWindowFrom(handle); m_handle = SDL_CreateWindowFrom(handle);
if (!m_handle || !SDL_GetWindowID(m_handle)) if (!m_handle)
{ {
NazaraError("Invalid handle"); NazaraError("Invalid handle");
return false; return false;

1
thirdparty/include/SDL2/SDL_config.h vendored
View File

@@ -214,7 +214,6 @@ typedef unsigned int uintptr_t;
/* Enable various video drivers */ /* Enable various video drivers */
#define SDL_VIDEO_DRIVER_DUMMY 1 #define SDL_VIDEO_DRIVER_DUMMY 1
#define SDL_VIDEO_DRIVER_WINDOWS 1
#ifndef SDL_VIDEO_RENDER_D3D #ifndef SDL_VIDEO_RENDER_D3D
#define SDL_VIDEO_RENDER_D3D 1 #define SDL_VIDEO_RENDER_D3D 1