From a012460c5cc7623c1e2aa0cf01f701ddebc0f6b6 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 5 Dec 2014 15:48:12 +0300 Subject: [PATCH] fixing dependencies --- src/dlangui/platforms/common/platform.d | 8 ++++---- src/dlangui/platforms/windows/winapp.d | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d index c82874ae..7c219b89 100644 --- a/src/dlangui/platforms/common/platform.d +++ b/src/dlangui/platforms/common/platform.d @@ -669,6 +669,8 @@ version (USE_OPENGL) { } } +//mixin template APP_ENTRY_POINT() { +//} /// put "mixin APP_ENTRY_POINT;" to main module of your dlangui based app mixin template APP_ENTRY_POINT() { @@ -685,13 +687,11 @@ mixin template APP_ENTRY_POINT() { /// workaround for link issue when WinMain is located in library version(Windows) { - private import win32.windows; private import dlangui.platforms.sdl.sdlapp; private import dlangui.platforms.windows.winapp; - extern (Windows) - int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) + extern (Windows) int WinMain(void* hInstance, void* hPrevInstance, + char* lpCmdLine, int nCmdShow) { return DLANGUIWinMain(hInstance, hPrevInstance, lpCmdLine, nCmdShow); diff --git a/src/dlangui/platforms/windows/winapp.d b/src/dlangui/platforms/windows/winapp.d index 85e02640..7d69b892 100644 --- a/src/dlangui/platforms/windows/winapp.d +++ b/src/dlangui/platforms/windows/winapp.d @@ -739,8 +739,8 @@ class Win32Platform : Platform { } extern(Windows) -int DLANGUIWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) { +int DLANGUIWinMain(void* hInstance, void* hPrevInstance, + char* lpCmdLine, int nCmdShow) { int result; try @@ -787,7 +787,7 @@ string[] splitCmdLine(string line) { private __gshared Win32Platform w32platform; -int myWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int iCmdShow) +int myWinMain(void* hInstance, void* hPrevInstance, char* lpCmdLine, int iCmdShow) { Log.setFileLogger(std.stdio.File("ui.log", "w")); debug {