flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Updated the makefile to disable assembly for clang.

Browse Source 
You need to set a flag manually, "disableasm=1" on the commandline.
This commit is contained in:
madmaxoft 2013-08-15 09:20:50 +02:00
parent 0297cf5485
commit 0aace84516
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
GNUmakefile
View File

@ -12,6 +12,8 @@
# Usage: # Usage:
# To make a release build, call "make release=1" # To make a release build, call "make release=1"
# To make a debug build, call "make" # 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 # 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) ifeq ($(addm32),1)
CC_OPTIONS += -m32 CC_OPTIONS += -m32
CXX_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 # INCLUDE directories for MCServer
# #