summaryrefslogtreecommitdiffstats
path: root/GNUmakefile
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-15 09:20:50 +0200
committermadmaxoft <github@xoft.cz>2013-08-15 09:20:50 +0200
commit0aace84516c88d49c0ba0cfe746344b48d153e34 (patch)
tree01d43a0cf81630d6c0480c735c9943d27046de23 /GNUmakefile
parentUpdated CryptoPP to 5.6.2 (diff)
downloadcuberite-0aace84516c88d49c0ba0cfe746344b48d153e34.tar
cuberite-0aace84516c88d49c0ba0cfe746344b48d153e34.tar.gz
cuberite-0aace84516c88d49c0ba0cfe746344b48d153e34.tar.bz2
cuberite-0aace84516c88d49c0ba0cfe746344b48d153e34.tar.lz
cuberite-0aace84516c88d49c0ba0cfe746344b48d153e34.tar.xz
cuberite-0aace84516c88d49c0ba0cfe746344b48d153e34.tar.zst
cuberite-0aace84516c88d49c0ba0cfe746344b48d153e34.zip
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile22
1 files changed, 19 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 277308e08..f139b3d39 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -12,6 +12,8 @@
# Usage:
# To make a release build, call "make release=1"
# To make a debug build, call "make"
+# To make a 32-bit build on 64-bit OS, pass the addm32=1 flag
+# To build with clang, you need to add disableasm=1 flag
#
###################################################
@@ -98,10 +100,9 @@ endif
-################
+###################################################
# 32-bit build override in 64-bit build environments
-# - so that BearBin doesn't need to modify his makefile after each makefile change :)
-################
+
ifeq ($(addm32),1)
CC_OPTIONS += -m32
CXX_OPTIONS += -m32
@@ -110,6 +111,21 @@ 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
#