Modify to work on modern GNU/Linux distributions

Makefile

@@ -6,10 +6,10 @@ SOURCE_FILES = connection.cpp environment.cpp client.cpp server.cpp socket.cpp m
 SOURCES = $(addprefix src/, $(SOURCE_FILES))
 OBJECTS = $(SOURCES:.cpp=.o)
 
-IRRLICHTPATH = ../irrlicht/irrlicht-1.7.1
-JTHREADPATH = ../jthread/jthread-1.2.1
+IRRLICHTPATH = /usr/include/irrlicht
+JTHREADPATH = jthread
 
-CPPFLAGS = -I$(IRRLICHTPATH)/include -I/usr/X11R6/include -I$(JTHREADPATH)/src
+CPPFLAGS = -I/usr/X11R6/include -I/usr/include/irrlicht -I/usr/local/include/irrlicht
 
 #CXXFLAGS = -O3 -ffast-math -Wall
 #CXXFLAGS = -O3 --fast-math -Wall -g
@@ -26,20 +26,16 @@ endif
 
 # Target specific settings
 
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L$(IRRLICHTPATH)/lib/Linux -L$(JTHREADPATH)/src/.libs -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljthread
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljthread
 all_linux clean_linux: SYSTEM=Linux
 
-all_win32: LDFLAGS = -L$(IRRLICHTPATH)/lib/Win32-gcc -L$(JTHREADPATH)/Debug -lIrrlicht -lopengl32 -lm -ljthread
-all_win32 clean_win32: SYSTEM=Win32-gcc
-all_win32 clean_win32: SUF=.exe
-
 # Name of the binary - only valid for targets which set SYSTEM
 
-DESTPATH = bin/$(TARGET)$(SUF)
+DESTPATH = bin/$(TARGET)
 
 # Build commands
 
-all_linux all_win32: $(DESTPATH)
+all_linux: $(DESTPATH)
 
 $(DESTPATH): $(OBJECTS)
 	$(CXX) -o $@ $(OBJECTS) $(LDFLAGS)
@@ -47,9 +43,9 @@ $(DESTPATH): $(OBJECTS)
 .cpp.o:
 	$(CXX) -c -o $@ $< $(CPPFLAGS) $(CXXFLAGS)
 
-clean: clean_linux clean_win32
+clean: clean_linux
 
-clean_linux clean_win32:
+clean_linux:
 	@$(RM) $(OBJECTS) $(DESTPATH)
 
-.PHONY: all all_win32 clean clean_linux clean_win32
+.PHONY: all all_clean clean_linux

src/client.cpp

@@ -2,7 +2,9 @@
 #include "utility.h"
 #include <iostream>
 #include "clientserver.h"
-#include "jmutexautolock.h"
+#include <jthread/jmutexautolock.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include "main.h"
 
 #ifdef _WIN32

src/client.h

@@ -4,7 +4,9 @@
 #include "connection.h"
 #include "environment.h"
 #include "common_irrlicht.h"
-#include "jmutex.h"
+#include <jthread/jmutex.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 
 class Client;
 

src/main.cpp

@@ -55,7 +55,7 @@ Actions:
 #define FIELD_OF_VIEW_TEST 0
 
 // Enable unit tests
-#define ENABLE_TESTS 1
+#define ENABLE_TESTS 0
 
 #ifdef _MSC_VER
 #pragma comment(lib, "Irrlicht.lib")
@@ -75,7 +75,9 @@ Actions:
 
 #include <iostream>
 #include <time.h>
-#include <jmutexautolock.h>
+#include <jthread/jmutexautolock.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include "common_irrlicht.h"
 #include "map.h"
 #include "player.h"

src/main.h

@@ -5,7 +5,9 @@
 #ifndef MAIN_HEADER
 #define MAIN_HEADER
 
-#include <jmutex.h>
+#include <jthread/jmutex.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 
 #define PI 3.14159
 

src/map.cpp

@@ -5,7 +5,9 @@
 #include "map.h"
 //#include "player.h"
 #include "main.h"
-#include "jmutexautolock.h"
+#include <jthread/jmutexautolock.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include "client.h"
 
 #ifdef _WIN32

src/map.h

@@ -5,8 +5,10 @@
 #ifndef MAP_HEADER
 #define MAP_HEADER
 
-#include <jmutex.h>
-#include <jthread.h>
+#include <jthread/jmutex.h>
+#include <jthread/jthread.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include <iostream>
 #include <malloc.h>
 

src/mapblock.h

@@ -5,7 +5,9 @@
 #ifndef MAPBLOCK_HEADER
 #define MAPBLOCK_HEADER
 
-#include <jmutex.h>
+#include <jthread/jmutex.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include <assert.h>
 #include <exception>
 #include "common_irrlicht.h"

src/mapsector.cpp

@@ -1,5 +1,7 @@
 #include "mapsector.h"
-#include "jmutexautolock.h"
+#include <jthread/jmutexautolock.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include "client.h"
 #include "exceptions.h"
 

src/mapsector.h

@@ -5,7 +5,9 @@
 #ifndef MAPSECTOR_HEADER
 #define MAPSECTOR_HEADER
 
-#include <jmutex.h>
+#include <jthread/jmutex.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include "common_irrlicht.h"
 #include "mapblock.h"
 #include "heightmap.h"

src/server.cpp

@@ -3,7 +3,9 @@
 #include <iostream>
 #include "clientserver.h"
 #include "map.h"
-#include "jmutexautolock.h"
+#include <jthread/jmutexautolock.h>
+namespace jthread {} // JThread 1.2 support
+using namespace jthread; // JThread 1.3 support
 #include "main.h"
 
 #ifdef _WIN32