Skip to content

Instantly share code, notes, and snippets.

@bellflower2015
Last active July 14, 2019 10:25
Show Gist options
  • Save bellflower2015/bbda88d38b10025b24e22e251b5691c5 to your computer and use it in GitHub Desktop.
Save bellflower2015/bbda88d38b10025b24e22e251b5691c5 to your computer and use it in GitHub Desktop.
SanDeGo-qt.pro.patch
diff --git a/SanDeGo-qt.pro b/SanDeGo-qt.pro
index 640f993..97fd98d 100644
--- a/SanDeGo-qt.pro
+++ b/SanDeGo-qt.pro
@@ -45,7 +45,7 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
}
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
-win32:QMAKE_LFLAGS += -static-libgcc -static-libstdc++
+win32:QMAKE_LFLAGS += -static -static-libgcc -static-libstdc++
# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
@@ -66,7 +66,7 @@ contains(USE_UPNP, -) {
count(USE_UPNP, 0) {
USE_UPNP=1
}
- DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
+ DEFINES += USE_UPNP=$$USE_UPNP STATICLIB MINIUPNP_STATICLIB
INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
win32:LIBS += -liphlpapi
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 9b2155b..4835f0b 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -48,7 +48,7 @@ endif
ifneq (${USE_UPNP}, -)
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
LIBS += -l miniupnpc -l iphlpapi
- DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
+ DEFS += -DSTATICLIB -DMINIUPNP_STATICLIB -DUSE_UPNP=$(USE_UPNP)
endif
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 14da5c4..8a88166 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -38,7 +38,7 @@ ifneq (${USE_UPNP}, -)
INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
LIBS += -l miniupnpc -l iphlpapi
- DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
+ DEFS += -DSTATICLIB -DMINIUPNP_STATICLIB -DUSE_UPNP=$(USE_UPNP)
endif
LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment