dsfml platform - initial support

This commit is contained in:
Vadim Lopatin 2015-03-27 16:48:40 +03:00
parent bf9f438d0f
commit 045621a90e
6 changed files with 38 additions and 23 deletions

View File

@ -27,6 +27,7 @@ Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "libdparse", "..\dlangide\li
EndProject EndProject
Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlanguisfml", "..\dsfml_project\dlanguisfml\dlanguisfml.visualdproj", "{5867E363-515A-4C7E-82C7-D1C1D35F55FC}" Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlanguisfml", "..\dsfml_project\dlanguisfml\dlanguisfml.visualdproj", "{5867E363-515A-4C7E-82C7-D1C1D35F55FC}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
{DB490C05-D9F8-431C-91DD-CEE646A64FDA} = {DB490C05-D9F8-431C-91DD-CEE646A64FDA} {DB490C05-D9F8-431C-91DD-CEE646A64FDA} = {DB490C05-D9F8-431C-91DD-CEE646A64FDA}
EndProjectSection EndProjectSection
EndProject EndProject

View File

@ -65,6 +65,19 @@
"derelict-sdl2": "~>1.9.1", "derelict-sdl2": "~>1.9.1",
"gl3n": "~>1.0.1" "gl3n": "~>1.0.1"
} }
},
{
"name": "sfml",
"versions": ["USE_DSFML", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources"],
"versions-windows": ["Unicode"],
"dependencies": {
"dlib": "~master",
"derelict-gl3": "~>1.0.12",
"derelict-ft": "~>1.0.0",
"derelict-sdl2": "~>1.9.1",
"gl3n": "~>1.0.1",
"dsfml": "~master"
}
} }
] ]
} }

View File

@ -89,7 +89,7 @@
<cv2pdbOptions /> <cv2pdbOptions />
<objfiles /> <objfiles />
<linkswitches /> <linkswitches />
<libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib dlangui.lib</libfiles> <libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib</libfiles>
<libpaths>../../Debug ../../../DerelictOpenGL3/source</libpaths> <libpaths>../../Debug ../../../DerelictOpenGL3/source</libpaths>
<deffile /> <deffile />
<resfile /> <resfile />

View File

@ -182,6 +182,10 @@ class Window {
abstract @property void windowCaption(dstring caption); abstract @property void windowCaption(dstring caption);
/// sets window icon /// sets window icon
abstract @property void windowIcon(DrawBufRef icon); abstract @property void windowIcon(DrawBufRef icon);
/// request window redraw
abstract void invalidate();
/// close window
abstract void close();
/// requests layout for main widget and popups /// requests layout for main widget and popups
void requestLayout() { void requestLayout() {
@ -1035,10 +1039,6 @@ class Window {
} }
debug(DebugRedraw) Log.d("checkUpdateNeeded returned needDraw=", needDraw, " needLayout=", needLayout, " animationActive=", animationActive); debug(DebugRedraw) Log.d("checkUpdateNeeded returned needDraw=", needDraw, " needLayout=", needLayout, " animationActive=", animationActive);
} }
/// request window redraw
abstract void invalidate();
/// close window
abstract void close();
protected bool _actionsUpdateRequested = true; protected bool _actionsUpdateRequested = true;

View File

@ -21,6 +21,7 @@ Authors: Vadim Lopatin, coolreader.org@gmail.com
*/ */
module dlangui.platforms.windows.winapp; module dlangui.platforms.windows.winapp;
version (USE_SDL) { } version (USE_SDL) { }
else version (USE_DSFML) { }
else version (Windows) { else version (Windows) {
import core.runtime; import core.runtime;