From e4ad43268e6783f35719ded4734e92b57a4a80d7 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Wed, 15 Mar 2023 19:17:48 +0300
Subject: [PATCH] [*] Windows optimization
---
3rdparty/monero_crypto/CMakeLists.txt | 3 ++-
cmake/OS_Detection.cmake | 4 +++-
dap-sdk | 2 +-
modules/consensus/esbocs/dap_chain_cs_esbocs.c | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/3rdparty/monero_crypto/CMakeLists.txt b/3rdparty/monero_crypto/CMakeLists.txt
index 2317ec6654..8da359fd3d 100755
--- a/3rdparty/monero_crypto/CMakeLists.txt
+++ b/3rdparty/monero_crypto/CMakeLists.txt
@@ -139,7 +139,8 @@ else()
set(USE_LTO_DEFAULT false)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,10485760")
if(NOT BUILD_64)
- add_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501)
+ #macro redefinition, so disable it
+ #add_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501)
endif()
endif()
set(C_WARNINGS "-Waggregate-return -Wnested-externs -Wold-style-definition -Wstrict-prototypes")
diff --git a/cmake/OS_Detection.cmake b/cmake/OS_Detection.cmake
index 1e5919ab38..f5a4be8229 100644
--- a/cmake/OS_Detection.cmake
+++ b/cmake/OS_Detection.cmake
@@ -146,6 +146,7 @@ endif()
if(WIN32)
message(STATUS "[*] Building for Windows")
+ add_definitions ("-DDAP_OS_WINDOWS")
add_definitions ("-DUNDEBUG")
add_definitions ("-DWIN32")
add_definitions ("-D_WINDOWS")
@@ -157,7 +158,8 @@ if(WIN32)
add_definitions("-DHAVE_STRNDUP")
add_definitions("-DNGHTTP2_STATICLIB")
add_compile_definitions(WINVER=0x0600 _WIN32_WINNT=0x0600)
- add_definitions ("-DDAP_OS_WINDOWS")
+ add_compile_definitions(__USE_MINGW_ANSI_STDIO=1)
+
set(CCOPT_SYSTEM "")
set(LDOPT_SYSTEM "")
diff --git a/dap-sdk b/dap-sdk
index be89b46ae7..9039cd7c25 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit be89b46ae7ac20620b50714d7ba852341f79fa51
+Subproject commit 9039cd7c25ac035c1651a14492b90f7a87a82c8d
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 4085295de4..d4f85b1345 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -1,4 +1,4 @@
-#include <pthread.h>
+#include "dap_common.h"
#include "utlist.h"
#include "dap_timerfd.h"
#include "rand/dap_rand.h"
--
GitLab