Skip to content

[pull] master from eliboa:master #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jun 21, 2025
Merged

[pull] master from eliboa:master #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e0c292
Try an other fix to build with the workflow.
shadow2560 Jun 21, 2025
d4853db
Try an other fix to build with the workflow.
shadow2560 Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
19 changes: 9 additions & 10 deletions NxNandManager/gui/NxNandManager.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand Down Expand Up @@ -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
}

Expand Down