summaryrefslogtreecommitdiffstats
path: root/GNUmakefile
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-16 12:25:53 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-16 12:25:53 +0200
commitcbde4f546a3135d9889b37aa227468106958a94a (patch)
tree0444a5f3d1797a01fb6a4c01def9933084652e8c /GNUmakefile
parentFeature and bugfixes [SEE DESC] (diff)
parentReplaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. (diff)
downloadcuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar
cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.gz
cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.bz2
cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.lz
cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.xz
cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.zst
cuberite-cbde4f546a3135d9889b37aa227468106958a94a.zip
Diffstat (limited to '')
-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
#