diff options
| author | Neozaru <neozaru@mailoo.org> | 2014-05-21 23:51:45 +0200 |
|---|---|---|
| committer | Neozaru <neozaru@mailoo.org> | 2014-05-21 23:51:45 +0200 |
| commit | 7c3783f5b1a955cf55fe184cb622d57aaf2d6477 (patch) | |
| tree | bbde755545664b2fad7a5f6fc78a2634822f7dc8 /CMakeLists.txt | |
| parent | Added 'save_bc' command in daemon for saving blockchain remotely (diff) | |
| parent | Update CMakeLists.txt (diff) | |
| download | monero-7c3783f5b1a955cf55fe184cb622d57aaf2d6477.tar.xz | |
Merge pull request #1 from monero-project/master
Attempting an online merge in my own repo
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 705513d66..3d367b2e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,8 @@ else() else() set(STATIC_ASSERT_FLAG "-Dstatic_assert=_Static_assert") endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GNU_SOURCE ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG} -maes") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GNU_SOURCE ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG} -maes") if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0") endif() |