From 8ea8104341bc95813664dd18712e2b9fe563675f Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 27 Mar 2015 09:47:12 +0300 Subject: [PATCH] configurations --- dlanguilib.visualdproj | 2 +- dub.json | 41 ++++++++++++++++++++++-------- examples/tetris/tetris.visualdproj | 2 +- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlanguilib.visualdproj b/dlanguilib.visualdproj index 2da59e99..2257e416 100644 --- a/dlanguilib.visualdproj +++ b/dlanguilib.visualdproj @@ -72,7 +72,7 @@ 0 DebugFocus 0 - EmbedStandardResources Unicode USE_FREETYPE + EmbedStandardResources Unicode USE_FREETYPE USE_OPENGL 0 0 1 diff --git a/dub.json b/dub.json index 112b2256..c33e67de 100644 --- a/dub.json +++ b/dub.json @@ -11,9 +11,6 @@ "targetName": "dlangui", "targetPath": "lib", "targetType": "staticLibrary", - "versions-posix": ["USE_SDL", "USE_OPENGL"], - "versions-windows": ["Unicode", "USE_FREETYPE"], - "versions": ["EmbedStandardResources"], "copyFiles-windows": ["lib/libfreetype-6.dll", "lib/zlib1.dll"], @@ -33,19 +30,41 @@ "views/res/i18n" ], - "dependencies": { - "derelict-gl3": ">=1.0.12", - "dlib": "~master", - "derelict-ft": ">=1.0.0", - "derelict-sdl2": ">=1.9.1", - "gl3n": "~>1.0.1" - }, - "-ddoxFilterArgs": ["--unittest-examples", "--min-protection=Protected", "--ex", "win32.", "--ex", "src.dlangui"], "subPackages": [ "./examples/helloworld/", "./examples/example1/", "./examples/tetris/" + ], + + "configurations": [ + { + "name": "default", + "versions": ["USE_OPENGL", "EmbedStandardResources", "USE_FREETYPE"], + "versions-posix": ["USE_SDL"], + "versions-windows": ["Unicode"], + "dependencies": { + "dlib": "~master", + "derelict-gl3": "~>1.0.12", + "derelict-ft": "~>1.0.0", + "gl3n": "~>1.0.1" + }, + "dependencies-posix": { + "derelict-sdl2": "~>1.9.1" + } + }, + { + "name": "sdl", + "versions": ["USE_SDL", "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" + } + } ] } diff --git a/examples/tetris/tetris.visualdproj b/examples/tetris/tetris.visualdproj index 3e96b75b..8f9ca642 100644 --- a/examples/tetris/tetris.visualdproj +++ b/examples/tetris/tetris.visualdproj @@ -72,7 +72,7 @@ 0 0 - Unicode USE_FREETYPE USE_OPENGL USE_SDL + Unicode USE_FREETYPE USE_OPENGL 0 3 0