rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed win64 crypto++ linker errors -- added build step for asm files.

This commit is contained in:
Nick Bolton 2013-04-10 17:27:25 +00:00
parent 9cd8023e92
commit 15de55176f
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/CMakeLists.txt
View File

@ -22,17 +22,35 @@ if (WIN32)
list(APPEND cpp_src ${cpp_hdr}) list(APPEND cpp_src ${cpp_hdr})
endif() endif()
if (WIN32) file(GLOB cpp_ignore
if (CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit ${cpp_dir}/simple.cpp
# do not compile crypto++ ASM on 64-bit windows, we just get ${cpp_dir}/strciphr.cpp
# bunch of linker errors. ${cpp_dir}/polynomi.cpp
set (CMAKE_CXX_FLAGS "/DCRYPTOPP_DISABLE_ASM /EHsc") ${cpp_dir}/eprecomp.cpp
endif() ${cpp_dir}/eccrypto.cpp
${cpp_dir}/algebra.cpp)
list(REMOVE_ITEM cpp_src ${cpp_ignore})
# 64-bit windows - compile asm file.
if(CMAKE_CL_64)
list(APPEND cpp_src ${cpp_dir}/x64dll.asm ${cpp_dir}/x64masm.asm)
add_custom_command(OUTPUT $(IntDir)x64dll.obj
COMMAND ml64.exe /c /nologo /Fo$(IntDir)x64dll.obj /Zi
"${CMAKE_CURRENT_SOURCE_DIR}/${cpp_dir}/x64dll.asm"
MAIN_DEPENDENCY ${cpp_dir}/x64dll.asm
VERBATIM)
add_custom_command(OUTPUT $(IntDir)x64masm.obj
COMMAND ml64.exe /c /nologo /Fo$(IntDir)x64masm.obj /Zi
"${CMAKE_CURRENT_SOURCE_DIR}/${cpp_dir}/x64masm.asm"
MAIN_DEPENDENCY ${cpp_dir}/x64masm.asm
VERBATIM)
endif() endif()
if (APPLE) if (APPLE)
# osx goes bat-shit crazy if we dont use these magical arguments. # osx goes bat-shit crazy if we dont use these magical arguments.
set (CMAKE_CXX_FLAGS "-O2 -DCRYPTOPP_DISABLE_ASM -pipe -Wno-tautological-compare") set(CMAKE_CXX_FLAGS "-O2 -DCRYPTOPP_DISABLE_ASM -pipe -Wno-tautological-compare")
endif() endif()
add_library(cryptopp STATIC ${cpp_src}) add_library(cryptopp STATIC ${cpp_src})