diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..4606f1b3 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "deps/DerelictUtil"] + path = deps/DerelictUtil + url = https://github.com/DerelictOrg/DerelictUtil.git +[submodule "deps/DerelictGL3"] + path = deps/DerelictGL3 + url = https://github.com/DerelictOrg/DerelictGL3.git +[submodule "deps/DerelictFT"] + path = deps/DerelictFT + url = https://github.com/DerelictOrg/DerelictFT.git +[submodule "deps/DerelictSDL2"] + path = deps/DerelictSDL2 + url = https://github.com/DerelictOrg/DerelictSDL2.git +[submodule "deps/x11"] + path = deps/x11 + url = https://github.com/nomad-software/x11.git diff --git a/README.md b/README.md index 76245d24..14980ff7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Dlang UI ======== +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/buggins/dlangui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/buggins/dlangui.svg?branch=master)](https://travis-ci.org/buggins/dlangui) [![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KPSNU8TYF6M5N "Donate once-off to this project using Paypal") + Cross platform GUI for D. Widgets, layouts, styles, themes, unicode, i18n, OpenGL based acceleration. GitHub page: [https://github.com/buggins/dlangui](https://github.com/buggins/dlangui) @@ -19,10 +21,9 @@ Coding style: [https://github.com/buggins/dlangui/blob/master/CODING_STYLE.md](h WARNING: recent breaking change: some event listeners were renamed, e.g. onClickListener -> click, onFocusChangeListener -> focusChange... +WARNING: dependencies in dlangui/deps now are git submodules (if you previously cloned them into deps directory, remove deps dir before updating dlangui project) -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/buggins/dlangui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/buggins/dlangui.svg?branch=master)](https://travis-ci.org/buggins/dlangui) [![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KPSNU8TYF6M5N "Donate once-off to this project using Paypal") - Main features: * Crossplatform (Win32, OSX, and Linux are supported in current version); can use SDL2 as a backend. @@ -140,7 +141,7 @@ Win32 builds Build and run demo app using DUB: - git clone https://github.com/buggins/dlangui.git + git clone --recursive https://github.com/buggins/dlangui.git cd dlangui dub run dlangui:example1 --build=release @@ -148,15 +149,9 @@ Run Tetris game example dub run dlangui:tetris --build=release -To develop using Visual-D or MonoD, download sources for dlabgui and dependencies into some directory: +To develop using Visual-D or MonoD, open dlangui.sln using Visual D (or dlangui-monod.sln for MonoD) - git clone https://github.com/buggins/dlangui.git - git clone https://github.com/DerelictOrg/DerelictUtil.git - git clone https://github.com/DerelictOrg/DerelictGL3.git - git clone https://github.com/DerelictOrg/DerelictFT.git - git clone https://github.com/DerelictOrg/DerelictSDL2.git -Then open dlangui.sln using Visual D (or dlangui-monod.sln for MonoD) To avoid showing console window add win_app.def file to your package source directory and add line to your dub.json. @@ -182,26 +177,15 @@ In some directory, e.g. ~/src/d/ : Clone DlangUI repository - git clone https://github.com/buggins/dlangui.git + git clone --recursive https://github.com/buggins/dlangui.git Enter dlangui directory cd dlangui -Clone dependency libraries - - mkdir deps - cd deps - git clone https://github.com/DerelictOrg/DerelictUtil.git - git clone https://github.com/DerelictOrg/DerelictGL3.git - git clone https://github.com/DerelictOrg/DerelictFT.git - git clone https://github.com/DerelictOrg/DerelictSDL2.git - git clone https://github.com/p0nce/DerelictCocoa.git - git clone https://github.com/nomad-software/x11.git - Open solution file with Mono-D - dlangui-monod-osx.sln + dlangui-monod-osx.sln @@ -221,16 +205,6 @@ Enter dlangui directory cd dlangui -Clone dependency libraries to dlangui/deps directory - - mkdir deps - cd deps - git clone https://github.com/DerelictOrg/DerelictUtil.git - git clone https://github.com/DerelictOrg/DerelictGL3.git - git clone https://github.com/DerelictOrg/DerelictFT.git - git clone https://github.com/DerelictOrg/DerelictSDL2.git - git clone https://github.com/nomad-software/x11.git - Open solution file with Mono-D dlangui-monod-linux.sln @@ -264,13 +238,11 @@ Following settings are to be applied to all configurations of your new project ( * In your project options Build/Includes put list of import directories of DlangUI library and its dependencies, like ../dlangui/src - ../dlangui/deps/gl3n ../dlangui/deps/DerelictSDL2/source ../dlangui/deps/DerelictFT/source ../dlangui/deps/DerelictGL3/source ../dlangui/deps/DerelictUtil/source ../dlangui/3rdparty - ../dlangui/3rdparty-extra Now you can build and run your project. @@ -291,16 +263,6 @@ Enter dlangui directory cd dlangui -Clone dependency libraries to dlangui/deps directory - - mkdir deps - cd deps - git clone https://github.com/DerelictOrg/DerelictUtil.git - git clone https://github.com/DerelictOrg/DerelictGL3.git - git clone https://github.com/DerelictOrg/DerelictFT.git - git clone https://github.com/DerelictOrg/DerelictSDL2.git - git clone https://github.com/Dav1dde/gl3n.git - Open solution file with Mono-D dlangui-monod-windows.sln @@ -352,27 +314,16 @@ Install GIT, DUB, DMD, MS Visual Studio (e.g. Community 2013) + VisualD plugin Clone DlangUI repository - git clone https://github.com/buggins/dlangui.git + git clone --recursive https://github.com/buggins/dlangui.git + +For DlangIDE development, close dlangide project on the same directory level as dlangui is cloned: + + git clone --recursive https://github.com/buggins/dlangide.git Enter dlangui directory cd dlangui -Clone dependency libraries to dlangui/deps directory - - mkdir deps - cd deps - git clone https://github.com/DerelictOrg/DerelictUtil.git - git clone https://github.com/DerelictOrg/DerelictGL3.git - git clone https://github.com/DerelictOrg/DerelictFT.git - git clone https://github.com/DerelictOrg/DerelictSDL2.git - git clone https://github.com/Hackerpilot/libdparse.git - -For DlangIDE development, close dlangide project on the same directory level as dlangui is cloned: - - cd ../.. - git clone --recursive https://github.com/buggins/dlangide.git - Open solution file with Visual-D dlangui-msvc.sln @@ -406,7 +357,6 @@ Following settings are to be applied to all configurations of your new project ( * In your project options Build/Includes put list of import directories of DlangUI library and its dependencies, like ../dlangui/src - ../dlangui/deps/gl3n ../dlangui/deps/DerelictSDL2/source ../dlangui/deps/DerelictFT/source ../dlangui/deps/DerelictGL3/source diff --git a/deps/DerelictFT b/deps/DerelictFT new file mode 160000 index 00000000..66dd3dd5 --- /dev/null +++ b/deps/DerelictFT @@ -0,0 +1 @@ +Subproject commit 66dd3dd516c4431b627e299c8b4b5074d6096b51 diff --git a/deps/DerelictGL3 b/deps/DerelictGL3 new file mode 160000 index 00000000..769c5b64 --- /dev/null +++ b/deps/DerelictGL3 @@ -0,0 +1 @@ +Subproject commit 769c5b6439d805cdcb29a9d1bcf4423bc513dd8b diff --git a/deps/DerelictSDL2 b/deps/DerelictSDL2 new file mode 160000 index 00000000..4f2e6ea4 --- /dev/null +++ b/deps/DerelictSDL2 @@ -0,0 +1 @@ +Subproject commit 4f2e6ea479a0e48e2e62fe963922fd141a440adc diff --git a/deps/DerelictUtil b/deps/DerelictUtil new file mode 160000 index 00000000..f3da3adb --- /dev/null +++ b/deps/DerelictUtil @@ -0,0 +1 @@ +Subproject commit f3da3adb0e425984904960e72f3bd95612f62535 diff --git a/deps/x11 b/deps/x11 new file mode 160000 index 00000000..2a0d6b8a --- /dev/null +++ b/deps/x11 @@ -0,0 +1 @@ +Subproject commit 2a0d6b8ac295e0ef70084a861fc027cbe953d7cb