Fix compilation of linux

src/fileio/resmgr/res_cursor.hpp

@@ -64,7 +64,7 @@ namespace ResMgr {
 		if(!found_hotspot)
 			std::cerr << "Cursor hotspot missing: " << fpath.string() << std::endl;
 		// TODO: Handle errors?
-		CursorRsrc* cur = new cCursor(fpath.string(),x,y);
+		CursorRsrc* cur = new Cursor(fpath.string(),x,y);
 		return cur;
 	}
 }

src/scenedit/scen.menus.linux.cpp

@@ -26,6 +26,9 @@ void init_menubar() {
 void shut_down_menus(short mode) {
 }
 
+void update_edit_menu() {
+}
+
 #include "cursors.hpp"
 
 #include "fileio.hpp"

src/tools/cursors.hpp

@@ -42,7 +42,7 @@ enum cursor_type {
 	text_curs, // Keep this one last
 };
 
-class cCursor {
+class Cursor {
 	void* ptr;
 public:
 	static cursor_type current;

src/tools/cursors.linux.cpp

@@ -1,28 +1,34 @@
 
 #include "cursors.hpp"
-#include "restypes.hpp" // Include before X11 to avoid macro conflicts in SFML
-#include <X11/Xlib.h>
-#include <X11/cursorfont.h>
+// #include "restypes.hpp" // Include before X11 to avoid macro conflicts in SFML
+#include "res_cursor.hpp"
 
-Cursor ibeam; // = XCreateFontCursor(NULL, XC_xterm);
+namespace x11 {
 
-extern cursor_type current_cursor;
+    #include <X11/Xlib.h>
+    #include <X11/cursorfont.h>
+
+}
+
+x11::Cursor ibeam; // = XCreateFontCursor(NULL, XC_xterm);
+
+// extern cursor_type current_cursor;
 extern sf::RenderWindow mainPtr;
 
-cCursor::cCursor(fs::path imgPath, float hotSpotX, float hotSpotY)
+Cursor::Cursor(fs::path imgPath, float hotSpotX, float hotSpotY)
     : ptr(nullptr) {
     
 }
 
-cCursor::~cCursor() {
+Cursor::~Cursor() {
     if (ptr != nullptr) {
-	    Cursor* realPtr = reinterpret_cast<Cursor*>(ptr);
-	    XFreeCursor(NULL, *realPtr);
+	    x11::Cursor* realPtr = reinterpret_cast<x11::Cursor*>(ptr);
+	    x11::XFreeCursor(NULL, *realPtr);
 	    delete realPtr;
 	}
 }
 
-void cCursor::apply() {
+void Cursor::apply() {
 	// XDefineCursor(NULL, current_window, *reinterpret_cast<Cursor*>(ptr));
 }
 
@@ -33,15 +39,16 @@ void obscureCursor() {
 
 void set_cursor(cursor_type which_c) {
 	if(which_c != watch_curs)
-		current_cursor = which_c;
+		// current_cursor = which_c;
+        Cursor::current = which_c;
 	if(which_c == text_curs) {
 		// XDefineCursor(NULL, current_window, ibeam);
 	} else {
-		cCursor& curs = *ResMgr::get<CursorRsrc>(cursors[which_c]);
+		Cursor& curs = *ResMgr::get<CursorRsrc>(cursors[which_c]);
 		curs.apply();
 	}
 }
 
 void restore_cursor() {
-	set_cursor(current_cursor);
+	set_cursor(Cursor::current);
 }

src/utility.hpp

@@ -21,6 +21,8 @@ std::string get_str(std::string list, short j);
 #define strnicmp strncasecmp
 #elif defined(_WIN32)
 #define strnicmp _strnicmp
+#elif defined(__unix__)
+#define strnicmp strncasecmp
 #else
 #error Missing strnicmp / strncasecmp
 #endif