Partial OSX support

[xonotic/netradiant.git] / radiant / server.cpp

diff --git a/radiant/server.cpp b/radiant/server.cpp
index 00221d7d7d165f49621a042f8b5bdd73593e19ce..714521c7ec6e14e8abe06706f463a00c38b98c26 100644 (file)
--- a/radiant/server.cpp
+++ b/radiant/server.cpp
@@ -22,10 +22,9 @@
 #include "server.h"
 
 #include "debugging/debugging.h"
-#include "warnings.h"
 
-#include <vector>
 #include <map>
+#include <vector>
 #include "os/path.h"
 
 #include "modulesystem.h"
@@ -151,7 +150,12 @@ public:
 typedef int ( *FunctionPointer )();
 
 DynamicLibrary( const char* filename ){
-       m_library = dlopen( filename, RTLD_NOW|RTLD_LOCAL|RTLD_DEEPBIND );
+       m_library = dlopen(filename, RTLD_LOCAL
+                                                                | RTLD_NOW
+                                                                #ifndef __APPLE__
+                                                                | RTLD_DEEPBIND
+                                 #endif
+       );
        if ( !m_library )
        {
                globalErrorStream() << "LoadLibrary failed: '" << filename << "'\n";