fixing dependencies

This commit is contained in:
Vadim Lopatin 2014-12-05 15:48:12 +03:00
parent ca3df5d375
commit a012460c5c
2 changed files with 7 additions and 7 deletions

View File

@ -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 /// put "mixin APP_ENTRY_POINT;" to main module of your dlangui based app
mixin template APP_ENTRY_POINT() { mixin template APP_ENTRY_POINT() {
@ -685,13 +687,11 @@ mixin template APP_ENTRY_POINT() {
/// workaround for link issue when WinMain is located in library /// workaround for link issue when WinMain is located in library
version(Windows) { version(Windows) {
private import win32.windows;
private import dlangui.platforms.sdl.sdlapp; private import dlangui.platforms.sdl.sdlapp;
private import dlangui.platforms.windows.winapp; private import dlangui.platforms.windows.winapp;
extern (Windows) extern (Windows) int WinMain(void* hInstance, void* hPrevInstance,
int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, char* lpCmdLine, int nCmdShow)
LPSTR lpCmdLine, int nCmdShow)
{ {
return DLANGUIWinMain(hInstance, hPrevInstance, return DLANGUIWinMain(hInstance, hPrevInstance,
lpCmdLine, nCmdShow); lpCmdLine, nCmdShow);

View File

@ -739,8 +739,8 @@ class Win32Platform : Platform {
} }
extern(Windows) extern(Windows)
int DLANGUIWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, int DLANGUIWinMain(void* hInstance, void* hPrevInstance,
LPSTR lpCmdLine, int nCmdShow) { char* lpCmdLine, int nCmdShow) {
int result; int result;
try try
@ -787,7 +787,7 @@ string[] splitCmdLine(string line) {
private __gshared Win32Platform w32platform; 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")); Log.setFileLogger(std.stdio.File("ui.log", "w"));
debug { debug {