From 78eb509eaaaa30e8180eb37a933283a78d1cb144 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Wed, 11 Nov 2015 21:16:59 +0300 Subject: [PATCH] fix osx dub builds --- dlangui-monod-osx.dproj | 1 + dub.json | 3 ++- examples/derelictcocoatest-monod-osx/src/cocoatest.d | 5 +++++ examples/example1/example1-monod-osx.dproj | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlangui-monod-osx.dproj b/dlangui-monod-osx.dproj index f55e9e10..b691eebd 100644 --- a/dlangui-monod-osx.dproj +++ b/dlangui-monod-osx.dproj @@ -42,6 +42,7 @@ USE_SDL USE_OPENGL + USE_FREETYPE EmbedStandardResources diff --git a/dub.json b/dub.json index 72acdc76..6088ef30 100644 --- a/dub.json +++ b/dub.json @@ -62,13 +62,14 @@ { "name": "minimal", "versions": ["EmbedStandardResources", "ForceLogs"], - "versions-posix": ["USE_SDL", "USE_FREETYPE"], + "versions-posix": ["USE_SDL", "USE_FREETYPE", "USE_OPENGL"], "versions-windows": ["Unicode"], "dependencies": { "dlib": "~>0.7.0", "gl3n": "~>1.2.0" }, "dependencies-posix": { + "derelict-gl3": "~>1.0.16", "derelict-sdl2": "~>1.9.7", "derelict-ft": "~>1.0.2" } diff --git a/examples/derelictcocoatest-monod-osx/src/cocoatest.d b/examples/derelictcocoatest-monod-osx/src/cocoatest.d index 0d3fc151..a88f6db9 100644 --- a/examples/derelictcocoatest-monod-osx/src/cocoatest.d +++ b/examples/derelictcocoatest-monod-osx/src/cocoatest.d @@ -32,7 +32,12 @@ void main(string[] args) NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask, //NSBorderlessWindowMask, NSBackingStoreBuffered, NO); window.makeKeyAndOrderFront(); + + NSView parentView; + parentView = window.contentView(); NSApp.activateIgnoringOtherApps(YES); NSApp.run(); + + DerelictCocoa.unload(); } diff --git a/examples/example1/example1-monod-osx.dproj b/examples/example1/example1-monod-osx.dproj index da70f515..e61d4c7c 100644 --- a/examples/example1/example1-monod-osx.dproj +++ b/examples/example1/example1-monod-osx.dproj @@ -53,6 +53,7 @@ USE_SDL USE_OPENGL + USE_FREETYPE EmbedStandardResources