forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix SDL configuration build

This commit is contained in:
Vadim Lopatin 2018-11-26 12:11:32 +03:00
parent 1953223c31
commit 317599ce87
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -42,8 +42,8 @@ import dlangui.platforms.common.platform;
import derelict.sdl2.sdl; import derelict.sdl2.sdl;
static if (ENABLE_OPENGL) { static if (ENABLE_OPENGL) {
import derelict.opengl3.gl3; //import derelict.opengl3.gl3;
import derelict.opengl3.gl; import derelict.opengl;
import dlangui.graphics.gldrawbuf; import dlangui.graphics.gldrawbuf;
import dlangui.graphics.glsupport; import dlangui.graphics.glsupport;
} }
@ -72,9 +72,9 @@ private derelict.util.exception.ShouldThrow missingSymFunc( string symName ) {
return derelict.util.exception.ShouldThrow.No; return derelict.util.exception.ShouldThrow.No;
} }
private __gshared uint USER_EVENT_ID; private __gshared SDL_EventType USER_EVENT_ID;
private __gshared uint TIMER_EVENT_ID; private __gshared SDL_EventType TIMER_EVENT_ID;
private __gshared uint WINDOW_CLOSE_EVENT_ID; private __gshared SDL_EventType WINDOW_CLOSE_EVENT_ID;
class SDLWindow : Window { class SDLWindow : Window {
SDLPlatform _platform; SDLPlatform _platform;
@ -244,7 +244,7 @@ class SDLWindow : Window {
if (!_dy) if (!_dy)
_dy = 400; _dy = 400;
_flags = flags; _flags = flags;
uint windowFlags = SDL_WINDOW_HIDDEN; SDL_WindowFlags windowFlags = SDL_WINDOW_HIDDEN;
if (flags & WindowFlag.Resizable) if (flags & WindowFlag.Resizable)
windowFlags |= SDL_WINDOW_RESIZABLE; windowFlags |= SDL_WINDOW_RESIZABLE;
if (flags & WindowFlag.Fullscreen) if (flags & WindowFlag.Fullscreen)
@ -740,15 +740,15 @@ class SDLWindow : Window {
if (_keyFlags & KeyFlag.Shift) if (_keyFlags & KeyFlag.Shift)
lastFlags |= MouseFlag.Shift; lastFlags |= MouseFlag.Shift;
else else
lastFlags &= ~MouseFlag.Shift; lastFlags &= ~cast(uint)MouseFlag.Shift;
if (_keyFlags & KeyFlag.Control) if (_keyFlags & KeyFlag.Control)
lastFlags |= MouseFlag.Control; lastFlags |= MouseFlag.Control;
else else
lastFlags &= ~MouseFlag.Control; lastFlags &= ~cast(uint)MouseFlag.Control;
if (_keyFlags & KeyFlag.Alt) if (_keyFlags & KeyFlag.Alt)
lastFlags |= MouseFlag.Alt; lastFlags |= MouseFlag.Alt;
else else
lastFlags &= ~MouseFlag.Alt; lastFlags &= ~cast(uint)MouseFlag.Alt;
if (wheelDelta) if (wheelDelta)
event = new MouseEvent(action, MouseButton.None, lastFlags, lastx, lasty, wheelDelta); event = new MouseEvent(action, MouseButton.None, lastFlags, lastx, lasty, wheelDelta);
} else { } else {
@ -1199,11 +1199,11 @@ class SDLPlatform : Platform {
w.dispatchThemeChanged(); w.dispatchThemeChanged();
} }
private uint _redrawEventId; private SDL_EventType _redrawEventId;
void sendRedrawEvent(uint windowId, uint code) { void sendRedrawEvent(uint windowId, uint code) {
if (!_redrawEventId) if (!_redrawEventId)
_redrawEventId = SDL_RegisterEvents(1); _redrawEventId = cast(SDL_EventType)SDL_RegisterEvents(1);
SDL_Event event; SDL_Event event;
event.type = _redrawEventId; event.type = _redrawEventId;
event.user.windowID = windowId; event.user.windowID = windowId;
@ -1651,8 +1651,8 @@ int sdlmain(string[] args) {
try { try {
DerelictGL3.missingSymbolCallback = &gl3MissingSymFunc; DerelictGL3.missingSymbolCallback = &gl3MissingSymFunc;
DerelictGL3.load(); DerelictGL3.load();
DerelictGL.missingSymbolCallback = &gl3MissingSymFunc; //DerelictGL3.missingSymbolCallback = &gl3MissingSymFunc;
DerelictGL.load(); //DerelictGL3.load();
_enableOpengl = true; _enableOpengl = true;
} catch (Exception e) { } catch (Exception e) {
Log.e("Cannot load opengl library", e); Log.e("Cannot load opengl library", e);
@ -1666,9 +1666,9 @@ int sdlmain(string[] args) {
} }
scope(exit)SDL_Quit(); scope(exit)SDL_Quit();
USER_EVENT_ID = SDL_RegisterEvents(1); USER_EVENT_ID = cast(SDL_EventType)SDL_RegisterEvents(1);
TIMER_EVENT_ID = SDL_RegisterEvents(1); TIMER_EVENT_ID = cast(SDL_EventType)SDL_RegisterEvents(1);
WINDOW_CLOSE_EVENT_ID = SDL_RegisterEvents(1); WINDOW_CLOSE_EVENT_ID = cast(SDL_EventType)SDL_RegisterEvents(1);
int request = SDL_GetDesktopDisplayMode(0, &displayMode); int request = SDL_GetDesktopDisplayMode(0, &displayMode);

2
views/DLANGUI_VERSION
View File

@ -1 +1 @@
v0.9.181 v0.9.182