diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index 1f0059afd..31f6e3d29 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -246,6 +246,8 @@ set(MUMBLE_SOURCES if(static AND WIN32) # On Windows, building a static client means building the main app into a DLL. add_library(mumble SHARED ${MUMBLE_SOURCES}) + add_compile_definitions(mumble PRIVATE "MUMBLEAPP_DLL") + set_target_properties(mumble PROPERTIES OUTPUT_NAME "mumble_app") if(MINGW) # Remove "lib" prefix. diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index f223106bc..a757e03d8 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -76,7 +76,7 @@ extern int os_early_init(); extern HWND mumble_mw_hwnd; #endif // Q_OS_WIN -#if defined(Q_OS_WIN) && !defined(QT_NO_DEBUG) +#if defined(Q_OS_WIN) && !defined(MUMBLEAPP_DLL) extern "C" __declspec(dllexport) int main(int argc, char **argv) { #else int main(int argc, char **argv) { @@ -759,7 +759,7 @@ int main(int argc, char **argv) { return res; } -#if defined(Q_OS_WIN) && defined(QT_NO_DEBUG) +#if defined(Q_OS_WIN) && defined(MUMBLEAPP_DLL) extern "C" __declspec(dllexport) int MumbleMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdArg, int cmdShow) { Q_UNUSED(instance) Q_UNUSED(prevInstance)