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

fix DSFML configuration build - close #472

This commit is contained in:
Vadim Lopatin 2017-10-06 10:21:12 +03:00
parent 782ca5f46d
commit 3d0805fc1f
6 changed files with 106 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -16,3 +16,6 @@
[submodule "deps/DerelictCocoa"] [submodule "deps/DerelictCocoa"]
path = deps/DerelictCocoa path = deps/DerelictCocoa
url = https://github.com/p0nce/DerelictCocoa.git url = https://github.com/p0nce/DerelictCocoa.git
[submodule "deps/DSFML"]
path = deps/DSFML
url = https://github.com/Jebbs/DSFML.git

1
deps/DSFML vendored Submodule

@ -0,0 +1 @@
Subproject commit 208ca646f2e762533fcb3227ce32effe49b1118e

90
dlangui-msvc.visualdproj
View File

@ -73,7 +73,7 @@
<debuglevel>0</debuglevel> <debuglevel>0</debuglevel>
<debugids>KeyInput</debugids> <debugids>KeyInput</debugids>
<versionlevel>0</versionlevel> <versionlevel>0</versionlevel>
<versionids>EmbedStandardResources ForceLogs NO_OPENGL USE_FREETYPE</versionids> <versionids>EmbedStandardResources ForceLogs USE_FREETYPE NO_OPENGL</versionids>
<dump_source>0</dump_source> <dump_source>0</dump_source>
<mapverbosity>0</mapverbosity> <mapverbosity>0</mapverbosity>
<createImplib>0</createImplib> <createImplib>0</createImplib>
@ -279,7 +279,7 @@
<debuglevel>0</debuglevel> <debuglevel>0</debuglevel>
<debugids /> <debugids />
<versionlevel>0</versionlevel> <versionlevel>0</versionlevel>
<versionids>EmbedStandardResources ForceLogs</versionids> <versionids>EmbedStandardResources ForceLogs NO_OPENGL USE_FREETYPE</versionids>
<dump_source>0</dump_source> <dump_source>0</dump_source>
<mapverbosity>0</mapverbosity> <mapverbosity>0</mapverbosity>
<createImplib>0</createImplib> <createImplib>0</createImplib>
@ -317,7 +317,7 @@
<multiobj>0</multiobj> <multiobj>0</multiobj>
<singleFileCompilation>0</singleFileCompilation> <singleFileCompilation>0</singleFileCompilation>
<oneobj>0</oneobj> <oneobj>0</oneobj>
<mscoff>1</mscoff> <mscoff>0</mscoff>
<trace>0</trace> <trace>0</trace>
<quiet>0</quiet> <quiet>0</quiet>
<verbose>0</verbose> <verbose>0</verbose>
@ -382,7 +382,7 @@
<debuglevel>0</debuglevel> <debuglevel>0</debuglevel>
<debugids>KeyInput</debugids> <debugids>KeyInput</debugids>
<versionlevel>0</versionlevel> <versionlevel>0</versionlevel>
<versionids>EmbedStandardResources ForceLogs NO_OPENGL USE_FREETYPE</versionids> <versionids>EmbedStandardResources ForceLogs USE_FREETYPE NO_OPENGL</versionids>
<dump_source>0</dump_source> <dump_source>0</dump_source>
<mapverbosity>0</mapverbosity> <mapverbosity>0</mapverbosity>
<createImplib>0</createImplib> <createImplib>0</createImplib>
@ -588,7 +588,7 @@
<debuglevel>0</debuglevel> <debuglevel>0</debuglevel>
<debugids /> <debugids />
<versionlevel>0</versionlevel> <versionlevel>0</versionlevel>
<versionids>EmbedStandardResources ForceLogs</versionids> <versionids>EmbedStandardResources ForceLogs NO_OPENGL USE_FREETYPE</versionids>
<dump_source>0</dump_source> <dump_source>0</dump_source>
<mapverbosity>0</mapverbosity> <mapverbosity>0</mapverbosity>
<createImplib>0</createImplib> <createImplib>0</createImplib>
@ -878,6 +878,86 @@
<File path="3rdparty\dimage\stream.d" /> <File path="3rdparty\dimage\stream.d" />
<File path="3rdparty\dimage\zlib.d" /> <File path="3rdparty\dimage\zlib.d" />
</Folder> </Folder>
<Folder name="DSFML">
<Folder name="audio">
<File path="deps\DSFML\src\dsfml\audio\listener.d" />
<File path="deps\DSFML\src\dsfml\audio\music.d" />
<File path="deps\DSFML\src\dsfml\audio\package.d" />
<File path="deps\DSFML\src\dsfml\audio\sound.d" />
<File path="deps\DSFML\src\dsfml\audio\soundbuffer.d" />
<File path="deps\DSFML\src\dsfml\audio\soundbufferrecorder.d" />
<File path="deps\DSFML\src\dsfml\audio\soundfile.d" />
<File path="deps\DSFML\src\dsfml\audio\soundrecorder.d" />
<File path="deps\DSFML\src\dsfml\audio\soundsource.d" />
<File path="deps\DSFML\src\dsfml\audio\soundstream.d" />
</Folder>
<Folder name="graphics">
<File path="deps\DSFML\src\dsfml\graphics\blendmode.d" />
<File path="deps\DSFML\src\dsfml\graphics\circleshape.d" />
<File path="deps\DSFML\src\dsfml\graphics\color.d" />
<File path="deps\DSFML\src\dsfml\graphics\convexshape.d" />
<File path="deps\DSFML\src\dsfml\graphics\drawable.d" />
<File path="deps\DSFML\src\dsfml\graphics\font.d" />
<File path="deps\DSFML\src\dsfml\graphics\glyph.d" />
<File path="deps\DSFML\src\dsfml\graphics\image.d" />
<File path="deps\DSFML\src\dsfml\graphics\package.d" />
<File path="deps\DSFML\src\dsfml\graphics\primitivetype.d" />
<File path="deps\DSFML\src\dsfml\graphics\rect.d" />
<File path="deps\DSFML\src\dsfml\graphics\rectangleshape.d" />
<File path="deps\DSFML\src\dsfml\graphics\renderstates.d" />
<File path="deps\DSFML\src\dsfml\graphics\rendertarget.d" />
<File path="deps\DSFML\src\dsfml\graphics\rendertexture.d" />
<File path="deps\DSFML\src\dsfml\graphics\renderwindow.d" />
<File path="deps\DSFML\src\dsfml\graphics\shader.d" />
<File path="deps\DSFML\src\dsfml\graphics\shape.d" />
<File path="deps\DSFML\src\dsfml\graphics\sprite.d" />
<File path="deps\DSFML\src\dsfml\graphics\text.d" />
<File path="deps\DSFML\src\dsfml\graphics\texture.d" />
<File path="deps\DSFML\src\dsfml\graphics\transform.d" />
<File path="deps\DSFML\src\dsfml\graphics\transformable.d" />
<File path="deps\DSFML\src\dsfml\graphics\vertex.d" />
<File path="deps\DSFML\src\dsfml\graphics\vertexarray.d" />
<File path="deps\DSFML\src\dsfml\graphics\view.d" />
</Folder>
<Folder name="network">
<File path="deps\DSFML\src\dsfml\network\ftp.d" />
<File path="deps\DSFML\src\dsfml\network\http.d" />
<File path="deps\DSFML\src\dsfml\network\ipaddress.d" />
<File path="deps\DSFML\src\dsfml\network\package.d" />
<File path="deps\DSFML\src\dsfml\network\packet.d" />
<File path="deps\DSFML\src\dsfml\network\socket.d" />
<File path="deps\DSFML\src\dsfml\network\socketselector.d" />
<File path="deps\DSFML\src\dsfml\network\tcplistener.d" />
<File path="deps\DSFML\src\dsfml\network\tcpsocket.d" />
<File path="deps\DSFML\src\dsfml\network\udpsocket.d" />
</Folder>
<Folder name="system">
<File path="deps\DSFML\src\dsfml\system\clock.d" />
<File path="deps\DSFML\src\dsfml\system\config.d" />
<File path="deps\DSFML\src\dsfml\system\err.d" />
<File path="deps\DSFML\src\dsfml\system\inputstream.d" />
<File path="deps\DSFML\src\dsfml\system\lock.d" />
<File path="deps\DSFML\src\dsfml\system\mutex.d" />
<File path="deps\DSFML\src\dsfml\system\package.d" />
<File path="deps\DSFML\src\dsfml\system\sleep.d" />
<File path="deps\DSFML\src\dsfml\system\string.d" />
<File path="deps\DSFML\src\dsfml\system\thread.d" />
<File path="deps\DSFML\src\dsfml\system\vector2.d" />
<File path="deps\DSFML\src\dsfml\system\vector3.d" />
</Folder>
<Folder name="window">
<File path="deps\DSFML\src\dsfml\window\context.d" />
<File path="deps\DSFML\src\dsfml\window\contextsettings.d" />
<File path="deps\DSFML\src\dsfml\window\event.d" />
<File path="deps\DSFML\src\dsfml\window\joystick.d" />
<File path="deps\DSFML\src\dsfml\window\keyboard.d" />
<File path="deps\DSFML\src\dsfml\window\mouse.d" />
<File path="deps\DSFML\src\dsfml\window\package.d" />
<File path="deps\DSFML\src\dsfml\window\videomode.d" />
<File path="deps\DSFML\src\dsfml\window\window.d" />
<File path="deps\DSFML\src\dsfml\window\windowhandle.d" />
</Folder>
</Folder>
<Folder name="fontconfig"> <Folder name="fontconfig">
<File path="3rdparty\fontconfig\fctypes.d" /> <File path="3rdparty\fontconfig\fctypes.d" />
<File path="3rdparty\fontconfig\functions.d" /> <File path="3rdparty\fontconfig\functions.d" />

8
src/dlangui/core/config.d
View File

@ -87,11 +87,11 @@ version(USE_CONSOLE) {
enum BACKEND_CONSOLE = false; enum BACKEND_CONSOLE = false;
} else version (USE_DSFML) { } else version (USE_DSFML) {
// DSFML backend already selected using version identifier // DSFML backend already selected using version identifier
version (USE_OPENGL) { //version (USE_OPENGL) {
enum ENABLE_OPENGL = true; enum ENABLE_OPENGL = true;
} else { //} else {
enum ENABLE_OPENGL = false; // enum ENABLE_OPENGL = false;
} //}
enum BACKEND_SDL = false; enum BACKEND_SDL = false;
enum BACKEND_X11 = false; enum BACKEND_X11 = false;
enum BACKEND_DSFML = true; enum BACKEND_DSFML = true;

8
src/dlangui/platforms/common/platform.d
View File

@ -373,7 +373,9 @@ class Window : CustomEventTarget {
/// close window /// close window
abstract void close(); abstract void close();
/// returns parent window /// returns parent window
abstract @property Window parentWindow(); @property Window parentWindow() {
return null;
}
protected WindowState _windowState = WindowState.normal; protected WindowState _windowState = WindowState.normal;
/// returns current window state /// returns current window state
@ -1027,7 +1029,9 @@ class Window : CustomEventTarget {
return _focusedWidget; return _focusedWidget;
} }
abstract @property bool isActive(); @property bool isActive() {
return true;
}
/// window state change signal /// window state change signal
Signal!OnWindowActivityHandler windowActivityChanged; Signal!OnWindowActivityHandler windowActivityChanged;

9
src/dlangui/platforms/dsfml/dsfmlapp.d
View File

@ -378,12 +378,17 @@ class DSFMLPlatform : Platform {
} }
/// retrieves text from clipboard (when mouseBuffer == true, use mouse selection clipboard - under linux) /// retrieves text from clipboard (when mouseBuffer == true, use mouse selection clipboard - under linux)
override dstring getClipboardText(bool mouseBuffer = false) { override dstring getClipboardText(bool mouseBuffer = false) {
// TODO: // TODO: implement if necessary
return ""d; return ""d;
} }
/// check has clipboard text
override bool hasClipboardText(bool mouseBuffer = false) {
// TODO: implement if necessary
return false;
}
/// sets text to clipboard (when mouseBuffer == true, use mouse selection clipboard - under linux) /// sets text to clipboard (when mouseBuffer == true, use mouse selection clipboard - under linux)
override void setClipboardText(dstring text, bool mouseBuffer = false) { override void setClipboardText(dstring text, bool mouseBuffer = false) {
// TODO: // TODO: implement if necessary
} }
/// calls request layout for all windows /// calls request layout for all windows