diff --git a/io/crossplatformlib.cpp b/io/crossplatformlib.cpp index 41d525525..217635f2a 100644 --- a/io/crossplatformlib.cpp +++ b/io/crossplatformlib.cpp @@ -6,7 +6,7 @@ ModulePtr LibLoad(const QString &filename) { #ifdef _WIN32 LPCWSTR dll_fn_w = reinterpret_cast(filename.utf16()); return LoadLibrary(dll_fn_w); -#elif __linux__ +#elif defined(__linux__) || defined(__APPLE__) return dlopen(filename.toUtf8(), RTLD_LAZY); #else qWarning() << "Olive doesn't know how to open dynamic libraries on this platform, external libraries will not be functional"; @@ -17,9 +17,7 @@ ModulePtr LibLoad(const QString &filename) { QStringList LibFilter() { #ifdef _WIN32 return QStringList("*.dll"); -#elif __linux__ - return QStringList("*.so"); -#elif __APPLE__ - return QStringList("*.dylib"); +#elif defined(__linux__) || defined(__APPLE__) + return {"*.so", "*.dylib"}; #endif } diff --git a/io/crossplatformlib.h b/io/crossplatformlib.h index c4f21d9d2..d186f554b 100644 --- a/io/crossplatformlib.h +++ b/io/crossplatformlib.h @@ -8,7 +8,7 @@ #define LibAddress GetProcAddress #define LibClose FreeModule #define ModulePtr HMODULE -#elif __linux__ +#elif defined(__linux__) || defined(__APPLE__) #include #define LibAddress dlsym #define LibClose dlclose