-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WIP: add scrypt-windows as submodule
Try the simple method first: we know that the code from barrysteyn/scrypt-windows compiles. So add it as submodule and convert the information from binding.gyp to a CMakeList.txt file that is only added to the Windows build. - add language C to project to enable CMake support for C code
- Loading branch information
Showing
8 changed files
with
49 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,32 +16,13 @@ jobs: | |
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
|
||
- name: Check out scrypt | ||
uses: actions/checkout@master | ||
uses: actions/checkout@v4 | ||
with: | ||
repository: barrysteyn/scrypt-windows | ||
path: scrypt-windows | ||
submodules: true | ||
|
||
- name: Add msbuild to PATH | ||
uses: microsoft/[email protected] | ||
|
||
- name: Install node | ||
uses: actions/setup-node@master | ||
|
||
- name: Install node-gyp | ||
shell: powershell | ||
run: | | ||
npm install --global node-gyp@latest | ||
- name: Build scrypt-windows | ||
working-directory: scrypt-windows | ||
run: | | ||
node-gyp configure | ||
node-gyp build | ||
node-gyp install | ||
- name: Install Qt | ||
uses: jurplel/install-qt-action@v3 | ||
with: | ||
|
@@ -52,13 +33,9 @@ jobs: | |
setup-python: false | ||
|
||
- name: Configure | ||
env: | ||
CXXFLAGS: -I${{ github.workspace }}/scrypt-windows/scrypt-1.1.6/lib | ||
run: > | ||
cmake -B ${{ runner.temp }}/build | ||
"-DCMAKE_LIBRARY_PATH=${{ github.workspace }}/scrypt-windows/build/Release" | ||
. | ||
run: | | ||
cmake -B ${{ runner.temp }}/build . | ||
- name: Build | ||
run: | | ||
cmake --build ${{ runner.temp }}/build | ||
cmake --build ${{ runner.temp }}/build --verbose |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[submodule "src/3rdparty/scrypt/scrypt-windows"] | ||
path = src/3rdparty/scrypt/scrypt-windows | ||
url = [email protected]:barrysteyn/scrypt-windows.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
if(WIN32) | ||
add_subdirectory(scrypt) | ||
|
||
target_sources(${TARGET} PRIVATE | ||
InputBuilder.cpp | ||
InputSimulator.cpp | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
set(SCRYPT_WINDOWS_LIB scrypt-windows) | ||
set(SCRYPT_WINDOWS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-windows) | ||
set(SCRYPT_SOURCE_DIR ${SCRYPT_WINDOWS_DIR}/scrypt-1.1.6) | ||
|
||
# static library implementation | ||
add_library(${SCRYPT_WINDOWS_LIB} STATIC | ||
${SCRYPT_SOURCE_DIR}/lib/crypto/crypto_scrypt-sse.c | ||
${SCRYPT_SOURCE_DIR}/lib/crypto/sha256.c | ||
${SCRYPT_WINDOWS_DIR}/win/mman.c | ||
) | ||
target_compile_definitions(${SCRYPT_WINDOWS_LIB} PRIVATE | ||
CONFIG_H_FILE=${SCRYPT_WINDOWS_DIR}/config.h | ||
) | ||
target_include_directories(${SCRYPT_WINDOWS_LIB} PRIVATE | ||
${SCRYPT_SOURCE_DIR} | ||
${SCRYPT_SOURCE_DIR}/lib/crypto | ||
${SCRYPT_SOURCE_DIR}/lib/scryptenc | ||
${SCRYPT_SOURCE_DIR}/lib/util | ||
${SCRYPT_WINDOWS_DIR}/win/include | ||
) | ||
# disable Qt features for static library code | ||
set_target_properties(${SCRYPT_WINDOWS_LIB} PROPERTIES | ||
AUTOMOC OFF | ||
AUTOUIC OFF | ||
) | ||
|
||
# static library interface | ||
target_include_directories(${TARGET} PRIVATE | ||
${SCRYPT_SOURCE_DIR}/lib | ||
) | ||
target_link_libraries(${TARGET} PRIVATE | ||
${SCRYPT_WINDOWS_LIB} | ||
) |
Submodule scrypt-windows
added at
043189