From 1d7b85c06a888e0b8c38c35aceed75e08d192e8a Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 2 Oct 2015 08:24:15 +0300 Subject: [PATCH] Modify to work on modern GNU/Linux distributions --- Makefile | 22 +++++++++------------- src/client.cpp | 4 +++- src/client.h | 4 +++- src/main.cpp | 6 ++++-- src/main.h | 4 +++- src/map.cpp | 4 +++- src/map.h | 6 ++++-- src/mapblock.h | 4 +++- src/mapsector.cpp | 4 +++- src/mapsector.h | 4 +++- src/server.cpp | 4 +++- 11 files changed, 41 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 8cc0eae..3dd6e9f 100644 --- a/Makefile +++ b/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 diff --git a/src/client.cpp b/src/client.cpp index a37aa2d..b4cfd73 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2,7 +2,9 @@ #include "utility.h" #include #include "clientserver.h" -#include "jmutexautolock.h" +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include "main.h" #ifdef _WIN32 diff --git a/src/client.h b/src/client.h index c76fc59..12cb7eb 100644 --- a/src/client.h +++ b/src/client.h @@ -4,7 +4,9 @@ #include "connection.h" #include "environment.h" #include "common_irrlicht.h" -#include "jmutex.h" +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support class Client; diff --git a/src/main.cpp b/src/main.cpp index 6ca6a73..b5499df 100644 --- a/src/main.cpp +++ b/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 #include -#include +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include "common_irrlicht.h" #include "map.h" #include "player.h" diff --git a/src/main.h b/src/main.h index 04102a3..7f44ea0 100644 --- a/src/main.h +++ b/src/main.h @@ -5,7 +5,9 @@ #ifndef MAIN_HEADER #define MAIN_HEADER -#include +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #define PI 3.14159 diff --git a/src/map.cpp b/src/map.cpp index a4e0a2e..107df05 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -5,7 +5,9 @@ #include "map.h" //#include "player.h" #include "main.h" -#include "jmutexautolock.h" +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include "client.h" #ifdef _WIN32 diff --git a/src/map.h b/src/map.h index b3ebc1e..c43ff60 100644 --- a/src/map.h +++ b/src/map.h @@ -5,8 +5,10 @@ #ifndef MAP_HEADER #define MAP_HEADER -#include -#include +#include +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include #include diff --git a/src/mapblock.h b/src/mapblock.h index fd760b2..c12a3ae 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -5,7 +5,9 @@ #ifndef MAPBLOCK_HEADER #define MAPBLOCK_HEADER -#include +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include #include #include "common_irrlicht.h" diff --git a/src/mapsector.cpp b/src/mapsector.cpp index cc7c5ec..e93303b 100644 --- a/src/mapsector.cpp +++ b/src/mapsector.cpp @@ -1,5 +1,7 @@ #include "mapsector.h" -#include "jmutexautolock.h" +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include "client.h" #include "exceptions.h" diff --git a/src/mapsector.h b/src/mapsector.h index 9618cca..9d4f666 100644 --- a/src/mapsector.h +++ b/src/mapsector.h @@ -5,7 +5,9 @@ #ifndef MAPSECTOR_HEADER #define MAPSECTOR_HEADER -#include +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include "common_irrlicht.h" #include "mapblock.h" #include "heightmap.h" diff --git a/src/server.cpp b/src/server.cpp index 4316ddc..8a411cb 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3,7 +3,9 @@ #include #include "clientserver.h" #include "map.h" -#include "jmutexautolock.h" +#include +namespace jthread {} // JThread 1.2 support +using namespace jthread; // JThread 1.3 support #include "main.h" #ifdef _WIN32