X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=366fcd6d5a08952153b45774dab709f6b4af877d;hb=82597c35e97568d9d53983211cdf29621cefdb51;hp=77e5ca2dd207647276fc41fe9fbf1646aae1f3a6;hpb=7ce6c4e45c16f4d7a69254fa13a14a93ce8b5ccd;p=novacoin.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 77e5ca2..366fcd6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.4.1)
 ##
 ## mkdir build && cd build
 ##
-## cmake -DBerkeleyDB_ROOT:STRING=/opt/homebrew/Cellar/berkeley-db@4/4.8.30 -DUSE_LEVELDB=1 ..
-## cmake -DUSE_LEVELDB=1 ..
+## cmake -DBerkeleyDB_ROOT:STRING=/opt/homebrew/Cellar/berkeley-db@4/4.8.30 ..
+## cmake ..
 ##
 
 project(novacoind VERSION 0.5.9 LANGUAGES C CXX)
@@ -29,7 +29,7 @@ if (NOT MSVC)
 if (NOT WIN32)
 set(FPIC "-fPIC")
 endif()
-set (CMAKE_C_FLAGS "-flto -O3 ${FPIC} -Wno-deprecated")
+set (CMAKE_C_FLAGS "-flto -O3 ${FPIC} -Wno-deprecated -fstack-protector-all")
 set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter -fexceptions -frtti")
 else()
 set(CMAKE_C_FLAGS "/O2")
@@ -39,12 +39,20 @@ endif()
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(Boost_USE_STATIC_LIBS   ON)
+if(WIN32)
 set(Boost_USE_STATIC_RUNTIME ON)
+endif()
 find_package(Boost REQUIRED COMPONENTS atomic chrono filesystem program_options system thread)
 set(OPENSSL_USE_STATIC_LIBS ON)
 find_package(OpenSSL REQUIRED)
 add_subdirectory(additional/IXWebSocket)
 
+# Apply patch for IXWebSocket issue
+execute_process (
+    COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/additional/fix_cerrno.sh"
+    OUTPUT_VARIABLE outIxVar
+)
+
 # Set default root path for berkeley db
 if (NOT BerkeleyDB_ROOT)
 set(BerkeleyDB_ROOT /usr)
@@ -105,6 +113,7 @@ set(generic_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/script.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/stun.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/sync.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/uint256.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/util.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wallet.cpp
@@ -114,10 +123,14 @@ set(generic_sources
 list(APPEND ALL_SOURCES ${generic_sources})
 list(APPEND ALL_LIBRARIES ${Boost_LIBRARIES} ixwebsocket OpenSSL::Crypto)
 
-# Windows-specific libraries
 if (WIN32)
+    # Windows-specific libraries
     list(APPEND ALL_LIBRARIES kernel32 user32 gdi32 comdlg32 winspool winmm shell32 comctl32 ole32 oleaut32 uuid rpcrt4 advapi32 ws2_32 mswsock shlwapi pthread)
     list(APPEND ALL_DEFINITIONS WIN32)
+
+    # Resources
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bitcoin.rc bitcoin.rc)
+    list(APPEND ALL_SOURCES ${CMAKE_BINARY_DIR}/bitcoin.rc)
 endif()
 
 # Some systems need rt library
@@ -138,19 +151,14 @@ if (NOT BDB_FOUND)
     message(FATAL_ERROR "Unable to find ${BerkeleyDB_LIB_name} library in ${BerkeleyDB_LIBS} directory. Try to specify either library path via BerkeleyDB_LIBS or berkeley db root path via BerkeleyDB_ROOT variable. You can also use BerkeleyDB_LIB_name variable to provide alternative file name search for.")
 endif()
 
-if(USE_LEVELDB)
-    # Disable useless targets
-    option(LEVELDB_BUILD_TESTS "Build LevelDB's unit tests" OFF)
-    option(LEVELDB_BUILD_BENCHMARKS "Build LevelDB's benchmarks" OFF)
-    option(LEVELDB_INSTALL "Install LevelDB's header and library" OFF)
+# Disable useless targets
+option(LEVELDB_BUILD_TESTS "Build LevelDB's unit tests" OFF)
+option(LEVELDB_BUILD_BENCHMARKS "Build LevelDB's benchmarks" OFF)
+option(LEVELDB_INSTALL "Install LevelDB's header and library" OFF)
 
-    add_subdirectory(additional/leveldb)
-    list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/txdb-leveldb.cpp)
-    list(APPEND ALL_LIBRARIES leveldb)
-    list(APPEND ALL_DEFINITIONS USE_LEVELDB)
-else()
-    list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/txdb-bdb.cpp)
-endif()
+add_subdirectory(additional/leveldb)
+list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/txdb-leveldb.cpp)
+list(APPEND ALL_LIBRARIES leveldb)
 
 if (NOT USE_GENERIC_SCRYPT)
     list( APPEND ALL_SOURCES ${generic_sources} ${CMAKE_CURRENT_SOURCE_DIR}/crypto/scrypt/intrin/scrypt-intrin.cpp )
@@ -164,16 +172,18 @@ execute_process (
     COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/../share/genbuild.sh ${CMAKE_CURRENT_SOURCE_DIR}/build.h"
     OUTPUT_VARIABLE outVar
 )
-list(APPEND ALL_DEFINITIONS HAVE_BUILD_INFO USE_IPV6)
+list(APPEND ALL_DEFINITIONS HAVE_BUILD_INFO USE_IPV6 BOOST_SPIRIT_THREADSAFE)
 
 add_executable(novacoind ${ALL_SOURCES})
 
 if (NOT MSVC)
-list(APPEND ALL_LIBRARIES ssp)
 list(APPEND ALL_DEFINITIONS _FORTIFY_SOURCE=2)
+set(ALL_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fstack-protector-all")
 if (WIN32)
-list(APPEND ALL_LIBRARIES mingw32)
+list(APPEND ALL_LIBRARIES mingw32 ssp)
+set(ALL_LINKER_FLAGS "${ALL_LINKER_FLAGS} -static-libgcc -static")
 endif()
+set(CMAKE_EXE_LINKER_FLAGS ${ALL_LINKER_FLAGS} CACHE INTERNAL "")
 endif()
 
 target_include_directories(novacoind PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/json ${BerkeleyDB_INC} ${CMAKE_CURRENT_SOURCE_DIR}/additional/leveldb/helpers ${Boost_INCLUDE_DIRS})