From 596963743e4651d4ae7560bde336852034baa50f Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 27 Nov 2013 17:18:40 +0000
Subject: Fixed a load of issues, clang autodetection works now.

This fixes issue #210.
This also removes the disableasm option, so it would be wise to remove
it from any scripts that use it.
I also removed a random line in the middle of globals.h, why was it
there?
---
 GNUmakefile | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'GNUmakefile')

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
 
 
@@ -125,23 +125,10 @@ 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
 
-- 
cgit v1.2.3