diff options
author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2009-03-03 10:18:44 +0000 |
---|---|---|
committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2009-03-03 10:18:44 +0000 |
commit | d73287b2b051540d487b5ac6f8aea342aa5b9678 (patch) | |
tree | fbc4aeb0fdfaf634a14dd8d232e0f99b7bcd948e /GNUmakefile | |
parent | 80416186794d128b7d0e88af1d469352404806d0 (diff) | |
download | cryptopp-d73287b2b051540d487b5ac6f8aea342aa5b9678.tar.gz |
fix VC60 compile, project file line-endings, Apple GCC 4.2 compile
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@437 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index 8d02244..d59c71c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -25,19 +25,13 @@ endif ifeq ($(ISX86),1) -GCC34_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(GCC\) (3.[4-9]|[4-9])") GCC42_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(GCC\) (4.[2-9]|[5-9])") INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)") GAS210_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2.[1-9][0-9]|[3-9])") -ifneq ($(GCC34_OR_LATER) $(INTEL_COMPILER),0 0) ifneq ($(GCC42_OR_LATER),0) +ifneq ($(UNAME),Darwin) CXXFLAGS += -march=native -mtune=native -else -# -msse2 is in GCC 3.3, but it causes internal compiler error on salsa.cpp, -# so don't use it unless we're at GCC 3.4 or later -# actually, we're not using SSE2 intrinsics anymore, and -msse2 causes invalid instructions on non-SSE2 CPUs -# CXXFLAGS += -msse2 endif endif |