CMakeLists.txt

@@ -2,8 +2,8 @@ project(cellframe-sdk C)
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "1.1-1")
-
+set(CELLFRAME_SDK_NATIVE_VERSION "1.2-1")
+include(cmake/OS_Detection.cmake)
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 
 if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (DAP_DEBUG))
@@ -41,7 +41,7 @@ if(UNIX)
 
     if (ANDROID)
         set(_CCOPT "${_CCOPT} -fforce-enable-int128 -std=gnu11")
-        add_definitions ("-DDAP_OS_ANDROID -DDAP_OS_UNIX")
+        add_definitions ("-DDAP_OS_ANDROID")
     endif()
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_CCOPT}")
@@ -57,9 +57,38 @@ if(UNIX)
 endif()
 
 if(WIN32)
-add_definitions("-DHAVE_PREAD")
-add_definitions("-DHAVE_MMAP")
-add_definitions("-DHAVE_STRNDUP")
+    message(STATUS "Building for Windows")
+    add_definitions("-DHAVE_PREAD")
+    add_definitions("-DHAVE_MMAP")
+    add_definitions("-DHAVE_STRNDUP")
+
+    add_definitions ("-DUNDEBUG")
+    add_definitions ("-DNDEBUG")
+    add_definitions ("-DWIN32")
+    add_definitions ("-D_WINDOWS")
+    add_definitions ("-D__WINDOWS__")
+    add_definitions ("-D_CRT_SECURE_NO_WARNINGS")
+    add_definitions ("-DCURL_STATICLIB")
+    add_definitions("-DHAVE_PREAD")
+    add_definitions("-DHAVE_MMAP")
+    add_definitions("-DHAVE_STRNDUP")
+    add_definitions("-DNGHTTP2_STATICLIB")
+    add_compile_definitions(WINVER=0x0600 _WIN32_WINNT=0x0600)
+    add_definitions ("-DDAP_OS_WINDOWS")
+
+     if(DAP_DEBUG)
+      set(_CCOPT "-mconsole -static -Wall -std=gnu11 -Wextra -Wno-unused-function -Wno-implicit-fallthrough -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -g3 -ggdb -fno-eliminate-unused-debug-symbols -pg")
+      set(_LOPT "-mconsole -static -pg")
+    else()
+      set(_CCOPT "-static -std=gnu11 -Wall -Wextra -Wno-unused-function -Wno-implicit-fallthrough -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -O3 -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
+    endif()
+
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_CCOPT} ")
+    set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${_LOPT}")
+
+    include_directories(3rdparty/uthash/src/)
+    include_directories(3rdparty/wepoll/)
+    #include_directories(libdap-chain-net-srv-vpn/)
 endif()
 
 add_subdirectory(libdap)

cmake/OS_Detection.cmake

+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set(OS_TYPE_DESKTOP ON)
+    set(LINUX ON)
+    set(UNIX ON)
+    EXECUTE_PROCESS( COMMAND cat /etc/os-release COMMAND grep VERSION_CODENAME COMMAND sed s/VERSION_CODENAME=// COMMAND tr -d '\n' OUTPUT_VARIABLE L_DEBIAN_OS_NAME)
+    EXECUTE_PROCESS( COMMAND cat /etc/os-release COMMAND grep VERSION_ID COMMAND sed s/VERSION_ID=// COMMAND tr -d '\n' COMMAND sed s/\\x22// COMMAND sed s/\\x22// OUTPUT_VARIABLE L_DEBIAN_OS_VERSION)
+    SET(DEBIAN_OS_NAME "${L_DEBIAN_OS_NAME}")
+    SET(DEBIAN_OS_VERSION ${L_DEBIAN_OS_VERSION})
+    message("Debian OS ${DEBIAN_OS_VERSION} (${DEBIAN_OS_NAME})")
+# check if we're building natively on Android (TERMUX)
+    EXECUTE_PROCESS( COMMAND uname -o COMMAND tr -d '\n' OUTPUT_VARIABLE OPERATING_SYSTEM)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
+    message("ANDROID")
+    set(ANDROID ON)
+    set(UNIX ON)
+    set(LINUX ON)
+    set(OS_TYPE_MOBILE ON)
+    message("ANDROID build")
+    add_definitions(-DANDROID -DDAP_OS_ANDROID)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Win")
+    message("Win build")
+    set(OS_TYPE_DESKTOP ON)
+endif()

libdap-chain-mempool @ 817aa1a4

-Subproject commit b69d7b0b39f661d682df90c180a923cf50a48942
+Subproject commit 817aa1a49043df3b41184a7f2f9a4ad5f835791a

libdap-chain-net @ ec5043ab

-Subproject commit 17ab54cfa0512aaa68a328193b949f4cad9e613a
+Subproject commit ec5043ab750a08ad2b79f83a964c18681220bf4d

libdap-server @ 7c90843f

-Subproject commit 03c530cc6090306df31c2b6ca9db62ae20f26869
+Subproject commit 7c90843f4c208233807b8bfb56ccc4e22b4f1bab