From 414513de66a7fe2b0647a92030ffd507b77cc4e7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 25 May 2022 19:24:37 +0100 Subject: [PATCH] Do not export DllMain for static windows builds Signed-off-by: falkTX --- distrho/src/DistrhoUtils.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/distrho/src/DistrhoUtils.cpp b/distrho/src/DistrhoUtils.cpp index 7aaed1a2..364461ff 100644 --- a/distrho/src/DistrhoUtils.cpp +++ b/distrho/src/DistrhoUtils.cpp @@ -30,7 +30,7 @@ # include #endif -#if defined(DISTRHO_OS_WINDOWS) && !DISTRHO_IS_STANDALONE +#if defined(DISTRHO_OS_WINDOWS) && !defined(STATIC_BUILD) && !DISTRHO_IS_STANDALONE static HINSTANCE hInstance = nullptr; DISTRHO_PLUGIN_EXPORT @@ -50,22 +50,24 @@ const char* getBinaryFilename() { static String filename; +#ifndef STATIC_BUILD if (filename.isNotEmpty()) return filename; -#ifdef DISTRHO_OS_WINDOWS -# if DISTRHO_IS_STANDALONE +# ifdef DISTRHO_OS_WINDOWS +# if DISTRHO_IS_STANDALONE constexpr const HINSTANCE hInstance = nullptr; -# endif +# endif CHAR filenameBuf[MAX_PATH]; filenameBuf[0] = '\0'; GetModuleFileNameA(hInstance, filenameBuf, sizeof(filenameBuf)); filename = filenameBuf; -#elif !defined(STATIC_BUILD) +# else Dl_info info; dladdr((void*)getBinaryFilename, &info); char filenameBuf[PATH_MAX]; filename = realpath(info.dli_fname, filenameBuf); +# endif #endif return filename;