summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile25
-rw-r--r--src/Globals.h1
2 files changed, 6 insertions, 20 deletions
diff --git a/GNUmakefile b/GNUmakefile
index b5c3da081..4b4bc0386 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -74,7 +74,9 @@ else
CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3
CXX_OPTIONS = -s -ggdb -g -D_DEBUG -O1
LNK_OPTIONS = -pthread -g -ggdb -O1
+
BUILDDIR = build/debug/
+
endif
endif
@@ -86,11 +88,9 @@ CXX_OPTIONS += -Wall
###################################################
# Fix Crypto++ warnings in clang
-ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),0)
-CC_OPTIONS += -Wno-tautological-compare
-CXX_OPTIONS += -Wno-tautological-compare
-disableasm = 1
-disableofast = 1
+ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),1)
+CC_OPTIONS += -DCRYPTOPP_DISABLE_ASM
+CXX_OPTIONS += -DCRYPTOPP_DISABLE_ASM
endif
@@ -126,22 +126,9 @@ endif
###################################################
-# Clang doesn't seem to support CryptoPP's assembly mode, disable it for now (CryptoPP 5.6.2)
-
-ifeq ($(disableasm),1)
- CC_OPTIONS += -DCRYPTOPP_DISABLE_ASM
- CXX_OPTIONS += -DCRYPTOPP_DISABLE_ASM
-endif
-
-
-
-
-
-###################################################
# INCLUDE directories for MCServer
-INCLUDE = -I.\
- -Isrc\
+INCLUDE = -Isrc\
-Ilib\
-Ilib/jsoncpp/include
diff --git a/src/Globals.h b/src/Globals.h
index ef79e4cf1..cb67d9fda 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -118,7 +118,6 @@ typedef unsigned short UInt16;
#include <dirent.h>
#include <errno.h>
#include <iostream>
-
#include <cstdio>
#include <cstring>
#include <pthread.h>