summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-09-11 19:55:06 +0200
committerAlexander Harkness <bearbin@gmail.com>2013-09-11 19:55:06 +0200
commit3abfd46f55ecd6d65b6683993e8383cd00596a34 (patch)
tree3bfe7e1aa38ead430cccdc1df8bc5c2b89397b48
parentAPIDump: First attempt at outputting annotations in the HTML format (diff)
parentmerged makefile changes (diff)
downloadcuberite-3abfd46f55ecd6d65b6683993e8383cd00596a34.tar
cuberite-3abfd46f55ecd6d65b6683993e8383cd00596a34.tar.gz
cuberite-3abfd46f55ecd6d65b6683993e8383cd00596a34.tar.bz2
cuberite-3abfd46f55ecd6d65b6683993e8383cd00596a34.tar.lz
cuberite-3abfd46f55ecd6d65b6683993e8383cd00596a34.tar.xz
cuberite-3abfd46f55ecd6d65b6683993e8383cd00596a34.tar.zst
cuberite-3abfd46f55ecd6d65b6683993e8383cd00596a34.zip
Diffstat (limited to '')
-rw-r--r--GNUmakefile9
1 files changed, 9 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 845aca3d9..00778a8f5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -85,6 +85,15 @@ endif
endif
+###################################################
+# 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
+endif
+
###################################################
# Set the link libraries based on the OS