From 51d1eabb8d9b1265f3253d518c742db51f5cbf5f Mon Sep 17 00:00:00 2001 From: drahosj Date: Fri, 27 Jan 2023 09:33:08 -0600 Subject: [PATCH] Fixed ole32.dll pragrma for cross-compilation (#650) * Fixed ole32.dll pragrma for cross-compilation Pragma specified Ole32.dll, which broke compilation on case-sensitive file systems, ie. when cross-compiling with ldc on Linux. * Replaced pragma with dub directive Deleted pragma(lib) and moved ole32 to libs-windows in dub.json --- dub.json | 2 ++ src/dlangui/core/files.d | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index 40125eb58..31f66a2a1 100644 --- a/dub.json +++ b/dub.json @@ -19,6 +19,8 @@ "libs-linux": ["z"], + "libs-windows": ["ole32"], + "stringImportPaths": [ "views" ], diff --git a/src/dlangui/core/files.d b/src/dlangui/core/files.d index c90e0ae25..069d4ff45 100644 --- a/src/dlangui/core/files.d +++ b/src/dlangui/core/files.d @@ -366,8 +366,6 @@ private: import core.sys.windows.objbase; import core.sys.windows.objidl; - pragma(lib, "Ole32"); - alias GUID KNOWNFOLDERID; extern(Windows) @nogc @system HRESULT _dummy_SHGetKnownFolderPath(const(KNOWNFOLDERID)* rfid, DWORD dwFlags, HANDLE hToken, wchar** ppszPath) nothrow;