From e948d463a086a3852022f5ad5b79c173f01c1e49 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 5 Dec 2014 13:22:30 +0300 Subject: [PATCH] fix dub package - use Win32 api build under windows --- README.md | 16 ++++++---------- dub.json | 7 ++++--- examples/example1/dub.json | 6 +++--- examples/helloworld/dub.json | 7 +++---- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 094cabf1..b06375e6 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,10 @@ Some screenshots: http://buggins.github.io/dlangui/screenshots.html * Supports highly customizable UI themes and styles * Supports internationalization * Hardware acceleration using OpenGL (when built with version USE_OPENGL) -* Fallback to Win32 API / XCB when OpenGL is not available +* Fallback to Win32 API / XCB when OpenGL is not available (e.g. opengl dynamic library cannot be loaded) * Actually it's a port (with major refactoring) of GUI library for cross platform OpenGL based implementation of Cool Reader app project from C++. * Almost ready for 2D games development -* Goal: provide set of widgets suitable for building of IDE. -* Non thread safe +* Non thread safe - all UI operations should be preformed in single thread Widgets @@ -44,6 +43,7 @@ Currently implemented widgets: * TabWidget - combination of TabControl and TabHost * GridWidgetBase - abstract Grid widget * StringGrid - grid view with strings content +* TreeWidget - tree view Layouts ------- @@ -55,6 +55,7 @@ Similar to layouts in Android * HorizontalLayout - just a LinearLayout with vertical orientation * FrameLayout - all children occupy the same place; usually onle one of them is visible * TableLayout - children are aligned into rows and columns of table +* ResizerWidget - put into LinearLayout between two other widgets to resize them using mouse List Views @@ -66,11 +67,6 @@ Lists are implemented similar to Android UI API. * ListAdapter - interface to provide data and widgets for ListWidget * WidgetListAdapter - simple implementation of ListAdapter interface - just a list of widgets (one per list item) to show -TODOs: - -* Multicolumn lists -* Tree view - Resources --------- @@ -104,7 +100,8 @@ Win32 builds * Optionally, may use OpenGL acceleration via DerelictGL3/WGL. * Uses Win32 API for font rendering. * Optinally can use FreeType for font rendering. - +* For Win32 API based application, only FreeImage.dll is required. +* Executable size for release Win32 API based build is 830K. Build and run using DUB: @@ -114,7 +111,6 @@ Build and run using DUB: dub run dlangui:example1 - To develop using Visual-D, download sources for dlabgui and dependencies into some directory: git clone https://github.com/buggins/dlangui.git diff --git a/dub.json b/dub.json index 00aca716..4439569b 100644 --- a/dub.json +++ b/dub.json @@ -1,17 +1,18 @@ { "name": "dlangui", - "description": "D language cross platform GUI library, inspired by Android UI API. Supports OpenGL based hardware acceleration, i18n, styles and themes.", + "description": "D language cross platform GUI library. Supports OpenGL based hardware acceleration, i18n, styles and themes.", "homepage": "https://github.com/buggins/dlangui", "license": "Boost", "authors": ["Vadim Lopatin"], "targetType": "none", "versions-windows": ["Unicode"], - "versions-posix": ["USE_OPENGL", "USE_SDL", "Unicode"], + "versions-linux": ["USE_OPENGL", "USE_SDL", "Unicode"], + "versions-osx": ["USE_OPENGL", "USE_SDL", "Unicode"], "subPackages": [ { - "versions-windows": ["USE_OPENGL", "Unicode"], + "versions-windows": ["Unicode"], "name": "dlanguilib", "description": "D language cross platform GUI library, inspired by Android UI API. Supports OpenGL based hardware acceleration, i18n, styles and themes.", "homepage": "https://github.com/buggins/dlangui", diff --git a/examples/example1/dub.json b/examples/example1/dub.json index 8b63adaf..a5a7056f 100644 --- a/examples/example1/dub.json +++ b/examples/example1/dub.json @@ -73,7 +73,6 @@ ], "copyFiles-windows": [ - "../../lib/SDL2.dll", "../../lib/FreeImage.dll" ], @@ -81,8 +80,9 @@ "libs-windows": ["dlanguilib", "phobos", "ole32", "kernel32", "user32", "comctl32", "comdlg32"], - "versions-windows": ["USE_OPENGL", "Unicode"], - "versions-posix": ["USE_OPENGL", "USE_SDL", "Unicode"], + "versions-windows": ["Unicode"], + "versions-linux": ["USE_OPENGL", "USE_SDL", "Unicode"], + "versions-osx": ["USE_OPENGL", "USE_SDL", "Unicode"], "dependencies": { diff --git a/examples/helloworld/dub.json b/examples/helloworld/dub.json index 095a8b92..17a547cc 100644 --- a/examples/helloworld/dub.json +++ b/examples/helloworld/dub.json @@ -72,16 +72,15 @@ ], "copyFiles-windows": [ "../../lib/FreeImage.dll", - "../../lib/libfreetype-6.dll", - "../../lib/libpng15.dll", - "../../lib/zlib1.dll" ], "mainSourceFile": "src/app.d", "libs-windows": ["dlanguilib", "phobos", "ole32", "kernel32", "user32", "comctl32", "comdlg32"], - "versions-windows": ["USE_OPENGL", "Unicode"], + "versions-windows": ["Unicode"], + "versions-linux": ["USE_OPENGL", "USE_SDL", "Unicode"], + "versions-osx": ["USE_OPENGL", "USE_SDL", "Unicode"], "dependencies": {