From 2d5c7ce8705eddb8ab49e082d429b5e3ab923bd5 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 4 Mar 2023 23:19:30 +0800 Subject: [PATCH 1/3] add build type variable --- .github/workflows/atomicdex-desktop-ci.yml | 1 + ci_tools_atomic_dex/ci_scripts/windows_script.ps1 | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index f1dc595d33..a16f9f3a76 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -256,6 +256,7 @@ jobs: shell: powershell run: | $Env:QT_VERSION = "${{ matrix.qt }}" + $Env:CMAKE_BUILD_TYPE = "${{ matrix.type }}" .\ci_tools_atomic_dex\ci_scripts\windows_script.ps1 - name: Upload env variable for artifacts (Linux) diff --git a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 index 191d0007b2..fbb2258a90 100644 --- a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 +++ b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 @@ -14,10 +14,12 @@ scoop cache rm git scoop cache rm cmake scoop cache rm ninja scoop cache rm llvm + $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\$Env:QT_VERSION\msvc2019_64" $Env:QT_ROOT = "C:\Qt" + mkdir b cd b -cmake --version +Invoke-Expression "cmake -DCMAKE_BUILD_TYPE=$Env:CMAKE_BUILD_TYPE -GNinja ../" cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../ ninja install From 3374c30b8e0f8cf08608af80b16722429d664c67 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 4 Mar 2023 23:24:26 +0800 Subject: [PATCH 2/3] rm old make cmd --- ci_tools_atomic_dex/ci_scripts/windows_script.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 index fbb2258a90..311ee71461 100644 --- a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 +++ b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 @@ -21,5 +21,4 @@ $Env:QT_ROOT = "C:\Qt" mkdir b cd b Invoke-Expression "cmake -DCMAKE_BUILD_TYPE=$Env:CMAKE_BUILD_TYPE -GNinja ../" -cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../ ninja install From 6e83d01eebf7a882196f2b68a6d798c498bc934f Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 27 Mar 2023 18:46:55 +0800 Subject: [PATCH 3/3] use local dll files --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dbf66bc0d..2b6d7125b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,10 +95,11 @@ else () configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config.json ${CMAKE_BINARY_DIR}/bin/assets/config/${PROJECT_VERSION}-coins.json COPYONLY) configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/coins COPYONLY) configure_file(${mm2_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/${DEX_API}.exe COPYONLY) - configure_file(${mm2_SOURCE_DIR}/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY) - configure_file(${mm2_SOURCE_DIR}/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY) endif () + add_subdirectory(vendor/antara-gaming_sdk/modules) ##! Osx bundle icon