Enable and fix for windows build by cmake project file#462
Enable and fix for windows build by cmake project file#462qwerity wants to merge 1 commit intoElementsProject:masterfrom
Conversation
c3113c0 to
a4d9349
Compare
|
Hi @qwerity Thanks for this! Can I ask you to make the following changes?
edit: master is now updated if you'd like to rebase. |
a4d9349 to
2f4e84c
Compare
jgriffiths
left a comment
There was a problem hiding this comment.
Hi,
Left some review comments. It appears you are not the original author of this code - is the original author OK with you submitting this PR?
| *.exp | ||
|
|
||
| .idea | ||
| cmake-build-* No newline at end of file |
There was a problem hiding this comment.
.idea is already in this file, and cmake build directories should be placed outside the repo rather than listed here.
| set(SECP256K1_ENABLE_MODULE_EXTRAKEYS ON) | ||
| set(SECP256K1_ENABLE_MODULE_SCHNORRSIG ON) | ||
| set(SECP256K1_ENABLE_MODULE_ELLSWIFT OFF) | ||
| set(SECP256K1_ENABLE_MODULE_ELLSWIFT ON) |
There was a problem hiding this comment.
The enabled modules here should match the ones set by configure (which they currently do). Why are you turning on extra modules here by default?
| #if (!defined(_SSIZE_T_DECLARED)) && (!defined(_ssize_t)) && (!defined(ssize_t)) | ||
| #define ssize_t long long | ||
| #endif | ||
| #endif |
|
|
||
| #ifndef _WIN32 | ||
| #include <unistd.h> | ||
| #endif |
There was a problem hiding this comment.
This file is not compiled when building, so I don't think this change is needed.
| target_include_directories(test_clear PRIVATE ${CMAKE_BINARY_DIR}) | ||
| target_link_libraries(test_clear PRIVATE wallycore pthread) | ||
| add_test(test_clear test_clear) | ||
| endif() |
|
|
||
| # wallycore | ||
| add_library(wallycore) | ||
| add_library(wallycore STATIC) |
There was a problem hiding this comment.
wally can (or should be able to be) build as a DLL for windows too.
Enabled by default cmake project files.
Also fixed the Windows build.
Tested for VS2019/VS2022.