diff --git a/.gitignore b/.gitignore index c59f9d51..3054653b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ index.html api.html screenshots.html *.log +include +lib/res diff --git a/README.md b/README.md index d8875d25..3b1f3789 100644 --- a/README.md +++ b/README.md @@ -207,13 +207,13 @@ Third party components used * DerelictSDL2 + SDL2 for cross platform support * WindowsAPI bindings from http://www.dsource.org/projects/bindings/wiki/WindowsApi (patched) * XCB and X11 bindings (patched) when SDL2 is not used; TODO: provide links -* DLIB - for loading images (it replaced FreeImage recently) +* DLIB - for loading GIF and JPEG images (it replaced FreeImage recently) Hello World -------------------------------------------------------------- - // main.d + // myproject.d import dlangui.all; mixin DLANGUI_ENTRY_POINT; @@ -249,20 +249,10 @@ Sample dub.json: { "name": "myproject", "description": "sample DLangUI project", - "homepage": "https://github.com/buggins/dlangui", - "license": "Boost", - "authors": ["Vadim Lopatin"], - "targetName": "example", "targetPath": "bin", "targetType": "executable", - "sourcePaths": ["src"], - - "sourceFiles": [ - "src/app.d" - ], - "copyFiles": [ "res" ], diff --git a/dub.json b/dub.json index b5f38981..4b5601ab 100644 --- a/dub.json +++ b/dub.json @@ -38,15 +38,14 @@ "sourcePaths-windows": [ "3rdparty" ], - "excludedSourceFiles-windows": [ - "3rdparty/X11/*" - ], "dependencies": { - "derelict-sdl2": ">=1.9.1", "derelict-gl3": ">=1.0.12", - "derelict-ft": ">=1.0.0", "dlib": ">=0.4.1" }, + "dependencies-posix": { + "derelict-ft": ">=1.0.0", + "derelict-sdl2": ">=1.9.1" + }, "-ddoxFilterArgs": ["--unittest-examples", "--min-protection=Protected", "--ex", "win32.", "--ex", "src.dlangui"] }, "./examples/helloworld/", diff --git a/examples/example1/dub.json b/examples/example1/dub.json index 0fecce9f..4aa252e5 100644 --- a/examples/example1/dub.json +++ b/examples/example1/dub.json @@ -5,21 +5,11 @@ "license": "Boost", "authors": ["Vadim Lopatin"], - "targetName": "example1", "targetPath": "bin", "targetType": "executable", - "sourceFiles": [ - "src/main.d" - ], - "copyFiles": ["res"], - "versions-posix": ["USE_SDL", "USE_OPENGL"], - "versions-windows": ["Unicode"], - - "mainSourceFile": "src/main.d", - "dependencies": { "dlangui:dlanguilib": "*" } diff --git a/examples/example1/src/main.d b/examples/example1/src/example1.d similarity index 100% rename from examples/example1/src/main.d rename to examples/example1/src/example1.d diff --git a/examples/helloworld/dub.json b/examples/helloworld/dub.json index 71cee0d5..ea5d49c1 100644 --- a/examples/helloworld/dub.json +++ b/examples/helloworld/dub.json @@ -5,23 +5,9 @@ "license": "Boost", "authors": ["Vadim Lopatin"], - "targetName": "helloworld", "targetPath": "bin", "targetType": "executable", - "versions-posix": ["USE_SDL", "USE_OPENGL"], - "versions-windows": ["USE_OPENGL"], - - "sourceFiles": [ - "src/app.d" - ], - - "copyFiles-windows": [ - "../../lib/FreeImage.dll" - ], - - "mainSourceFile": "src/app.d", - "dependencies": { "dlangui:dlanguilib": "*", } diff --git a/examples/helloworld/src/app.d b/examples/helloworld/src/helloworld.d similarity index 100% rename from examples/helloworld/src/app.d rename to examples/helloworld/src/helloworld.d diff --git a/examples/tetris/dub.json b/examples/tetris/dub.json index 4b125991..34d5657d 100644 --- a/examples/tetris/dub.json +++ b/examples/tetris/dub.json @@ -5,78 +5,11 @@ "license": "Boost", "authors": ["Vadim Lopatin"], - "targetName": "tetris", "targetPath": "bin", "targetType": "executable", - "sourceFiles": [ - "src/main.d" - ], - "copyFiles": ["res"], - "versions-posix": ["USE_SDL", "USE_OPENGL"], - "versions-windows": ["Unicode"], - - "mainSourceFile": "src/main.d", - - "sourceFiles-windows": [ - "../../3rdparty/win32/basetsd.d", - "../../3rdparty/win32/basetyps.d", - "../../3rdparty/win32/cderr.d", - "../../3rdparty/win32/cguid.d", - "../../3rdparty/win32/commdlg.d", - "../../3rdparty/win32/commctrl.d", - "../../3rdparty/win32/core.d", - "../../3rdparty/win32/dde.d", - "../../3rdparty/win32/ddeml.d", - "../../3rdparty/win32/dlgs.d", - "../../3rdparty/win32/imm.d", - "../../3rdparty/win32/lzexpand.d", - "../../3rdparty/win32/mmsystem.d", - "../../3rdparty/win32/nb30.d", - "../../3rdparty/win32/oaidl.d", - "../../3rdparty/win32/objbase.d", - "../../3rdparty/win32/objfwd.d", - "../../3rdparty/win32/objidl.d", - "../../3rdparty/win32/ole.d", - "../../3rdparty/win32/ole2.d", - "../../3rdparty/win32/oleauto.d", - "../../3rdparty/win32/olectlid.d", - "../../3rdparty/win32/oleidl.d", - "../../3rdparty/win32/prsht.d", - "../../3rdparty/win32/rpc.d", - "../../3rdparty/win32/rpcdce.d", - "../../3rdparty/win32/rpcdcep.d", - "../../3rdparty/win32/rpcndr.d", - "../../3rdparty/win32/rpcnsi.d", - "../../3rdparty/win32/rpcnsip.d", - "../../3rdparty/win32/rpcnterr.d", - "../../3rdparty/win32/shellapi.d", - "../../3rdparty/win32/shlobj.d", - "../../3rdparty/win32/shlguid.d", - "../../3rdparty/win32/unknwn.d", - "../../3rdparty/win32/uuid.d", - "../../3rdparty/win32/w32api.d", - "../../3rdparty/win32/winbase.d", - "../../3rdparty/win32/wincon.d", - "../../3rdparty/win32/windef.d", - "../../3rdparty/win32/windows.d", - "../../3rdparty/win32/winerror.d", - "../../3rdparty/win32/wingdi.d", - "../../3rdparty/win32/winnetwk.d", - "../../3rdparty/win32/winnls.d", - "../../3rdparty/win32/winnt.d", - "../../3rdparty/win32/winperf.d", - "../../3rdparty/win32/winsock2.d", - "../../3rdparty/win32/winspool.d", - "../../3rdparty/win32/winsvc.d", - "../../3rdparty/win32/winuser.d", - "../../3rdparty/win32/winver.d", - "../../3rdparty/win32/ws2tcpip.d", - "../../3rdparty/win32/wtypes.d", - ], - "dependencies": { "dlangui:dlanguilib": "*" } diff --git a/examples/tetris/src/main.d b/examples/tetris/src/tetris.d similarity index 100% rename from examples/tetris/src/main.d rename to examples/tetris/src/tetris.d