aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMITSUNARI Shigeo <herumi@nifty.com>2018-07-26 18:19:28 +0800
committerMITSUNARI Shigeo <herumi@nifty.com>2018-07-26 18:19:28 +0800
commitf9c951fc2ccb64d1479fc1a0c4615302ce6bcb0f (patch)
tree9d370d3d539569133c2fcd0c14c3029a758d06e0
parent9b8a4bbd9951932f7b9afd12e67b0ebcf42515af (diff)
downloaddexon-mcl-f9c951fc2ccb64d1479fc1a0c4615302ce6bcb0f.tar.gz
dexon-mcl-f9c951fc2ccb64d1479fc1a0c4615302ce6bcb0f.tar.zst
dexon-mcl-f9c951fc2ccb64d1479fc1a0c4615302ce6bcb0f.zip
disable warning of vc
-rw-r--r--common.mk14
-rw-r--r--test/fp_tower_test.cpp4
2 files changed, 9 insertions, 9 deletions
diff --git a/common.mk b/common.mk
index aefa516..59e4939 100644
--- a/common.mk
+++ b/common.mk
@@ -20,16 +20,12 @@ else
LIB_SUF=so
endif
ARCH?=$(shell uname -m)
-DO_IT=0
-ifeq ($(ARCH),x86_64)
- DO_IT=1
-endif
-ifeq ($(ARCH),amd64)
- DO_IT=1
-endif
-ifeq ($(DO_IT),1)
+ifneq ($(findstring $(ARCH),x86_64/amd64),)
CPU=x86-64
INTEL=1
+ ifeq ($(findstring $(OS),mingw64/cygwin),)
+ GCC_EXT=1
+ endif
BIT=64
BIT_OPT=-m64
#LOW_ASM_SRC=src/asm/low_x86-64.asm
@@ -61,7 +57,7 @@ MKDIR=mkdir -p
RM=rm -rf
ifeq ($(DEBUG),1)
- ifeq ($(INTEL),1)
+ ifeq ($(GCC_EXT),1)
CFLAGS+=-fsanitize=address
LDFLAGS+=-fsanitize=address
endif
diff --git a/test/fp_tower_test.cpp b/test/fp_tower_test.cpp
index 9859bf9..1428137 100644
--- a/test/fp_tower_test.cpp
+++ b/test/fp_tower_test.cpp
@@ -7,6 +7,10 @@
#include <mcl/fp.hpp>
#include <mcl/fp_tower.hpp>
+#ifdef _MSC_VER
+ #pragma warning(disable : 4456)
+#endif
+
#if MCL_MAX_BIT_SIZE >= 768
typedef mcl::FpT<mcl::FpTag, MCL_MAX_BIT_SIZE> Fp;
#else