diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-04-07 16:13:42 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-04-07 16:13:42 -0400 |
| commit | 7292dea19222d1f6acba2fcee475d0726476d3fe (patch) | |
| tree | d3e53f5b71fc1d8ac38566c36f50612b96e42b48 | |
| parent | Only compile BerkeleyDB as an option in non-static (diff) | |
| parent | explicitly disable AES on ARM (diff) | |
| download | monero-7292dea19222d1f6acba2fcee475d0726476d3fe.tar.xz | |
Merges PR #37
New/updated Makefile targets
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Makefile | 22 |
2 files changed, 29 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f0494396..7d731eb82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,7 +236,15 @@ else() 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") endif() - + + string(SUBSTRING ${ARCH} 0 3 ARM_TEST) + string(TOLOWER ${ARM_TEST} ARM_TEST) + if(${ARM_TEST} STREQUAL "arm") + message(STATUS "Setting ARM C and C++ flags") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp -mfloat-abi=hard") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=vfp -mfloat-abi=hard") + endif() + if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0") endif() @@ -30,9 +30,27 @@ release-all: mkdir -p build/release cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) -release-static: +release-static: release-static-64 + +release-static-64: + mkdir -p build/release + cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + +release-static-32: + mkdir -p build/release + cd build/release && cmake -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + +release-static-arm6: + mkdir -p build/release + cd build/release && cmake -D STATIC=ON -D ARCH="armv6zk" -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + +release-static-win64: + mkdir -p build/release + cmake -G "MSYS Makefiles" -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys64 ../.. && $(MAKE) + +release-static-win32: mkdir -p build/release - cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + cmake -G "MSYS Makefiles" -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys32 ../.. && $(MAKE) clean: @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ |