From 8b87cd19c2c22a723ff165f5f3e38bc78c4cf041 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 5 Dec 2014 18:02:32 +0300 Subject: [PATCH] trying to fix dependencies --- dub.json | 6 ++++ examples/example1/dub.json | 67 ------------------------------------ examples/helloworld/dub.json | 64 +--------------------------------- src/dlangui/core/i18n.d | 1 + 4 files changed, 8 insertions(+), 130 deletions(-) diff --git a/dub.json b/dub.json index 58423c25..46e49dc7 100644 --- a/dub.json +++ b/dub.json @@ -21,6 +21,12 @@ "project.ddoc" ], + "excludedSourceFiles": [ + "../../src/api.d", + "../../src/index.d", + "../../src/screenshots.d" + ], + "sourceFiles-windows": [ "3rdparty/win32/basetsd.d", "3rdparty/win32/basetyps.d", diff --git a/examples/example1/dub.json b/examples/example1/dub.json index 677b5c53..0b37d4c9 100644 --- a/examples/example1/dub.json +++ b/examples/example1/dub.json @@ -9,83 +9,16 @@ "targetPath": "bin", "targetType": "executable", - "sourcePaths": ["../../src"], - - "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" - ], - "sourceFiles": [ "src/main.d" ], - "excludedSourceFiles": [ - "../../src/api.d", - "../../src/index.d", - "../../src/screenshots.d" - ], - "copyFiles-windows": [ "../../lib/FreeImage.dll" ], "mainSourceFile": "src/main.d", - "libs-windows": ["dlanguilib", "phobos", "ole32", "kernel32", "user32", "comctl32", "comdlg32"], - "dependencies": { "dlangui:dlanguilib": "~master", "derelict-sdl2": "~master", diff --git a/examples/helloworld/dub.json b/examples/helloworld/dub.json index 4db24c46..9894c6ef 100644 --- a/examples/helloworld/dub.json +++ b/examples/helloworld/dub.json @@ -9,79 +9,17 @@ "targetPath": "bin", "targetType": "executable", - "sourcePaths": ["../../src"], - - "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" - ], "sourceFiles": [ "src/app.d" ], + "copyFiles-windows": [ "../../lib/FreeImage.dll", ], "mainSourceFile": "src/app.d", - "libs-windows": ["dlanguilib", "phobos", "ole32", "kernel32", "user32", "comctl32", "comdlg32"], - "dependencies": { "dlangui:dlanguilib": "~master", - "derelict-gl3": "~master", - "derelict-fi": "~master", - "derelict-ft": "~master" } } diff --git a/src/dlangui/core/i18n.d b/src/dlangui/core/i18n.d index 4c910c69..5821da54 100644 --- a/src/dlangui/core/i18n.d +++ b/src/dlangui/core/i18n.d @@ -40,6 +40,7 @@ module dlangui.core.i18n; import dlangui.core.types; import dlangui.core.logger; +private import dlangui.core.linestream; import std.utf; /// container for UI string - either raw value or string resource ID