remove need to "brew install ncurses"

multitheftauto · Jul 24, 2017 · 74f2975 · 74f2975
1 parent 371f7b2
commit 74f2975
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Server/core/CCrashHandler.cpp b/Server/core/CCrashHandler.cpp
@@ -18,17 +18,19 @@
 #endif
 
 #ifndef WIN32
-    #include <ncursesw/curses.h>
     extern "C" WINDOW* m_wndMenu;
     extern "C" WINDOW* m_wndInput;
     extern "C" bool g_bNoCurses;
     #ifdef __APPLE__
+        #include <curses.h>
         #include <client/mac/handler/exception_handler.h>
 
         // From https://archive.fo/DJvyQ
         bool DumpCallback(const char* _dump_dir, const char* _minidump_id, void *context, bool succeeded );
     #else
+        #include <ncursesw/curses.h>
         #include <client/linux/handler/exception_handler.h>
+
         bool DumpCallback( const google_breakpad::MinidumpDescriptor& descriptor, void* context, bool succeeded );
     #endif
     static SString ms_strDumpPathFilename;

diff --git a/Server/core/CServerImpl.h b/Server/core/CServerImpl.h
@@ -30,8 +30,10 @@ class CServerImpl;
 #include <xml/CXML.h>
 #include "CThreadCommandQueue.h"
 
-#ifndef WIN32
-#include <ncursesw/curses.h>
+#if defined(__APPLE__)
+    #include <curses.h>
+#elif !defined(WIN32)
+    #include <ncursesw/curses.h>
 #endif
 
 #define SERVER_RESET_RETURN 500

diff --git a/Server/sdk/MTAPlatform.h b/Server/sdk/MTAPlatform.h
@@ -74,10 +74,15 @@ extern "C" bool g_bNoTopBar;
     #include <string.h>
     #include <string>
     #include <fcntl.h>
-    #include <ncursesw/curses.h>
     #include <dlfcn.h>
     #include <sys/time.h>
     #include <sys/times.h>
+
+    #if defined(__APPLE__)
+        #include <curses.h>
+    #else
+        #include <ncursesw/curses.h>
+    #endif
 
     #define MAX_PATH 255