diff options
Diffstat (limited to '')
-rw-r--r-- | .github/workflows/release-qt5.yml | 2 | ||||
-rw-r--r-- | .github/workflows/release.yml | 2 | ||||
-rw-r--r-- | .github/workflows/testing-nightly.yml | 2 | ||||
-rw-r--r-- | src/core/function/GlobalSettingStation.cpp | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml index 38c5107a..5bc5da8a 100644 --- a/.github/workflows/release-qt5.yml +++ b/.github/workflows/release-qt5.yml @@ -242,7 +242,7 @@ jobs: cp TRANSLATORS build/artifacts/ cp COPYING build/artifacts/ cp gpgfrontend.ico build/artifacts/bin/ - rm -rf build/artifacts/bin/modules/*.a + rm -rf build/artifacts/bin/*.a touch build/artifacts/bin/PORTABLE.txt cd build windeployqt-qt6 --no-translations --force ./artifacts/bin/libgf_core.dll diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 204466f0..d94b6e87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -319,7 +319,9 @@ jobs: cp TRANSLATORS build/artifacts/ cp COPYING build/artifacts/ cp gpgfrontend.ico build/artifacts/bin/ + rm -rf build/artifacts/bin/*.a rm -rf build/artifacts/bin/modules/*.a + mv build/artifacts/bin/modules build/artifacts/modules touch build/artifacts/bin/PORTABLE.txt cd build windeployqt-qt6 --no-translations --force ./artifacts/bin/libgf_core.dll diff --git a/.github/workflows/testing-nightly.yml b/.github/workflows/testing-nightly.yml index b9232479..491e4fe5 100644 --- a/.github/workflows/testing-nightly.yml +++ b/.github/workflows/testing-nightly.yml @@ -306,7 +306,9 @@ jobs: cp TRANSLATORS build/artifacts/ cp COPYING build/artifacts/ cp gpgfrontend.ico build/artifacts/bin/ + rm -rf build/artifacts/bin/*.a rm -rf build/artifacts/bin/modules/*.a + mv build/artifacts/bin/modules build/artifacts/modules touch build/artifacts/bin/PORTABLE.txt cd build windeployqt-qt6 --no-translations --force ./artifacts/bin/libgf_core.dll diff --git a/src/core/function/GlobalSettingStation.cpp b/src/core/function/GlobalSettingStation.cpp index 21f1c743..28b4ade7 100644 --- a/src/core/function/GlobalSettingStation.cpp +++ b/src/core/function/GlobalSettingStation.cpp @@ -170,13 +170,7 @@ class GlobalSettingStation::Impl { #endif #if defined(_WIN32) || defined(WIN32) - -#ifdef NDEBUG return exec_binary_path + "/../modules"; -#else - return exec_binary_path + "/../modules/bin"; -#endif - #endif #if defined(__APPLE__) && defined(__MACH__) |