diff --git a/cmake-proxies/cmake-modules/FindwxWidgets.cmake b/cmake-proxies/cmake-modules/FindwxWidgets.cmake index 86fc471..cb2f6f6 100644 --- a/cmake-proxies/cmake-modules/FindwxWidgets.cmake +++ b/cmake-proxies/cmake-modules/FindwxWidgets.cmake @@ -209,11 +209,7 @@ endif() #===================================================================== # Determine whether unix or win32 paths should be used #===================================================================== -if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING) set(wxWidgets_FIND_STYLE "win32") -else() - set(wxWidgets_FIND_STYLE "unix") -endif() #===================================================================== # WIN32_FIND_STYLE diff --git a/include/audacity/Types.h b/include/audacity/Types.h index 9547b19..994a150 100644 --- a/include/audacity/Types.h +++ b/include/audacity/Types.h @@ -844,6 +844,9 @@ using EffectFamilySymbol = ComponentInterfaceSymbol; #endif #endif #endif + + // KXStudio custom build + #define AUDACITY_DLL_API __attribute__((visibility("default"))) #endif #endif // __AUDACITY_TYPES_H__ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 409b34a..79e8f3c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1028,7 +1028,6 @@ audacity_append_common_compiler_options( OPTIONS ) list( APPEND LDFLAGS PRIVATE $<$:/MANIFEST:NO> - $<$:-Wl,--disable-new-dtags> ) # diff --git a/src/effects/VST/VSTControlMSW.h b/src/effects/VST/VSTControlMSW.h index f9477ea..f679a3e 100644 --- a/src/effects/VST/VSTControlMSW.h +++ b/src/effects/VST/VSTControlMSW.h @@ -11,7 +11,7 @@ #ifndef AUDACITY_VSTCONTROLMSW_H #define AUDACITY_VSTCONTROLMSW_H -#include +#include #include "VSTControl.h"