patch: use miniupnpc include version. patch: openssl from path to lib…

… path. patch: Digitalnote config with latest windows libs paths.

DigitalNote.app.pro

@@ -33,7 +33,7 @@ include(include/options/use_dbus.pri)
 include(include/options/use_pch.pri)
 include(include/options/use_unity_build.pri)
 include(include/options/use_limits_patch.pri)
-include(include/options/use_latest_miniupnpc.pri)
+include(include/options/use_miniupnpc_version.pri)
 
 ## Libraries
 include(include/libs.pri)

DigitalNote.daemon.pro

@@ -29,7 +29,7 @@ include(include/options/use_build_info.pri)
 include(include/options/use_pch.pri)
 include(include/options/use_unity_build.pri)
 include(include/options/use_limits_patch.pri)
-include(include/options/use_latest_miniupnpc.pri)
+include(include/options/use_miniupnpc_version.pri)
 
 ## Libraries
 include(include/libs.pri)

DigitalNote_config.pri

@@ -18,39 +18,39 @@ DIGITALNOTE_SECP256K1_LIB_PATH        = $${DIGITALNOTE_PATH}/src/secp256k1/.libs
 win32 {
 	## Boost
 	DIGITALNOTE_BOOST_PATH            = $${DIGITALNOTE_PATH}/../libs/boost_1_80_0
-	DIGITALNOTE_BOOST_INCLUDE_PATH    = $${DIGITALNOTE_PATH}/../libs/boost_1_80_0
-	DIGITALNOTE_BOOST_LIB_PATH        = $${DIGITALNOTE_PATH}/../libs/boost_1_80_0/stage/lib
+	DIGITALNOTE_BOOST_INCLUDE_PATH    = $${DIGITALNOTE_PATH}/../libs/boost_1_80_0/include/boost-1_80
+	DIGITALNOTE_BOOST_LIB_PATH        = $${DIGITALNOTE_PATH}/../libs/boost_1_80_0/lib
 	DIGITALNOTE_BOOST_SUFFIX          = -mgw12-mt-s-x64-1_80
 
 	## OpenSSL library
 	DIGITALNOTE_OPENSSL_PATH          = $${DIGITALNOTE_PATH}/../libs/openssl-1.1.1s
 	DIGITALNOTE_OPENSSL_INCLUDE_PATH  = $${DIGITALNOTE_PATH}/../libs/openssl-1.1.1s/include
-	DIGITALNOTE_OPENSSL_LIB_PATH      = $${DIGITALNOTE_PATH}/../libs/openssl-1.1.1s
+	DIGITALNOTE_OPENSSL_LIB_PATH      = $${DIGITALNOTE_PATH}/../libs/openssl-1.1.1s/lib
 
 	## Berkeley db library
 	DIGITALNOTE_BDB_PATH              = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC
-	DIGITALNOTE_BDB_INCLUDE_PATH      = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC/build_unix
-	DIGITALNOTE_BDB_LIB_PATH          = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC/build_unix
+	DIGITALNOTE_BDB_INCLUDE_PATH      = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC/include
+	DIGITALNOTE_BDB_LIB_PATH          = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC/lib
 
 	## Event library
 	DIGITALNOTE_EVENT_PATH            = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.12-stable
 	DIGITALNOTE_EVENT_INCLUDE_PATH    = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.12-stable/include
-	DIGITALNOTE_EVENT_LIB_PATH        = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.12-stable/.libs
+	DIGITALNOTE_EVENT_LIB_PATH        = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.12-stable/lib
 
 	## GMP library
 	DIGITALNOTE_GMP_PATH              = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1
-	DIGITALNOTE_GMP_INCLUDE_PATH      = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1
-	DIGITALNOTE_GMP_LIB_PATH          = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1/.libs
+	DIGITALNOTE_GMP_INCLUDE_PATH      = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1/include
+	DIGITALNOTE_GMP_LIB_PATH          = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1/lib
 
 	## Miniupnp library
 	DIGITALNOTE_MINIUPNP_PATH         = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.2.4
 	DIGITALNOTE_MINIUPNP_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.2.4/include
-	DIGITALNOTE_MINIUPNP_LIB_PATH     = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.2.4
+	DIGITALNOTE_MINIUPNP_LIB_PATH     = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.2.4/lib
 
 	## QREncode library
 	DIGITALNOTE_QRENCODE_PATH         = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1
-	DIGITALNOTE_QRENCODE_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1
-	DIGITALNOTE_QRENCODE_LIB_PATH     = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1/.libs
+	DIGITALNOTE_QRENCODE_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1/include
+	DIGITALNOTE_QRENCODE_LIB_PATH     = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1/lib
 }
 
 macx {
@@ -60,7 +60,7 @@ macx {
 	DIGITALNOTE_BOOST_PATH            = /usr/local/Cellar/boost/1.76.0
 	DIGITALNOTE_BOOST_INCLUDE_PATH    = /usr/local/Cellar/boost/1.76.0/include
 	DIGITALNOTE_BOOST_LIB_PATH        = /usr/local/Cellar/boost/1.76.0/lib
-	DIGITALNOTE_BOOST_SUFFIX = -mt
+	DIGITALNOTE_BOOST_SUFFIX          = -mt
 
 	## OpenSSL library
 	DIGITALNOTE_OPENSSL_PATH          = /usr/local/Cellar/openssl@1.1/1.1.1k

include/libs/miniupnpc.pri

@@ -7,7 +7,7 @@ contains(USE_UPNP, 1) {
 	message(Building UPNP support)
 
 	win32 {
-		exists($${DIGITALNOTE_MINIUPNP_PATH}/libminiupnpc.a) {
+		exists($${DIGITALNOTE_MINIUPNP_LIB_PATH}/libminiupnpc.a) {
 			message("found MiniUPNP lib")
 		} else {
 			message("You need to compile lib MiniUPNP yourself.")

include/libs/openssl.pri

@@ -1,11 +1,11 @@
 win32 {
 	FAIL = 0
 
-	!exists($${DIGITALNOTE_OPENSSL_PATH}/libssl.a) {
+	!exists($${DIGITALNOTE_OPENSSL_LIB_PATH}/libssl.a) {
 		FAIL = 1
 	}
 
-	!exists($${DIGITALNOTE_OPENSSL_PATH}/libcrypto.a) {
+	!exists($${DIGITALNOTE_OPENSSL_LIB_PATH}/libcrypto.a) {
 		FAIL = 1
 	}
 

include/options/use_latest_miniupnpc.pri → include/options/use_miniupnpc_version.pri

@@ -1,9 +1,11 @@
 ##
+##	Old version contains version number inside include name
+##
 ##	Ubuntu 22.04 doesn't automaticly install the developers version by default.
 ##	You have to manually execute:
 ##		sudo apt-get install -y libminiupnpc-dev
 ##
 
-contains(USE_UBUNTU2204_MINIUPNPC, 1) {
-	DEFINES += UBUNTU2204_MINIUPNPC
+contains(USE_MINIUPNPC_VERSION, 1) {
+	DEFINES += USE_MINIUPNPC_VERSION
 }

src/net.cpp

@@ -7,7 +7,7 @@
 #endif
 
 #ifdef USE_UPNP
-	#ifndef UBUNTU2204_MINIUPNPC
+	#ifdef USE_MINIUPNPC_VERSION
 		#include <miniupnpc-2.1/miniupnpc.h>
 		#include <miniupnpc-2.1/miniwget.h>
 		#include <miniupnpc-2.1/upnpcommands.h>