diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88fbe6f0..ea97b525 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,6 @@ jobs: base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-qt5-static - mingw-w64-x86_64-openssl - name: build shell: msys2 {0} run: | diff --git a/NxNandManager/gui/NxNandManager.pro b/NxNandManager/gui/NxNandManager.pro index 05e1bcea..6f7cda17 100644 --- a/NxNandManager/gui/NxNandManager.pro +++ b/NxNandManager/gui/NxNandManager.pro @@ -114,20 +114,19 @@ HEADERS += \ dump.h \ progress.h \ emunand.h \ - $$files(../lib/ZipLib/*.h, false) \ - $$files(../lib/ZipLib/utils/*.h, false) \ - $$files(../lib/ZipLib/detail/*.h, false) \ - $$files(../lib/ZipLib/extlibs/bzip2/*.h, false) \ - $$files(../lib/ZipLib/extlibs/lzma/*.h, false) \ + ../lib/ZipLib/*.h \ + ../lib/ZipLib/utils/*.h \ + ../lib/ZipLib/detail/*.h \ + ../lib/ZipLib/extlibs/bzip2/*.h \ + ../lib/ZipLib/extlibs/lzma/*.h \ debug.h CONFIG(STATIC) { - SOURCES += $$files(../lib/ZipLib/extlibs/zlib/*.c, false) - HEADERS += $$files(../lib/ZipLib/extlibs/zlib/*.h) + HEADERS -= ../lib/ZipLib/extlibs/zlib/zconf.h } CONFIG(DYNAMIC) { SOURCES += $$files(../lib/ZipLib/extlibs/zlib/*.c, false) - HEADERS += $$files(../lib/ZipLib/extlibs/zlib/*.h) + HEADERS += ../lib/ZipLib/extlibs/zlib/*.h \ } FORMS += \ @@ -159,14 +158,14 @@ RC_FILE = NxNandManager.rc CONFIG(ARCH32) { DEFINES += ARCH32 #OPENSSL PATH - OPENSSL_LIB_PATH = $$PWD/../../../OpenSSL_mingw32 + OPENSSL_LIB_PATH = $$PWD/../../../../../mingw32 LIBS += -L$$PWD/../virtual_fs/dokan/x86/lib/ -ldokan1 } CONFIG(ARCH64) { DEFINES += ARCH64 #OPENSSL PATH - OPENSSL_LIB_PATH = $$PWD/../../../OpenSSL_mingw64 + OPENSSL_LIB_PATH = $$PWD/../../../../../mingw64 LIBS += -L$$PWD/../virtual_fs/dokan/x64/lib/ -ldokan1 }