Merge pull request #20430 from kreinholz/master

Fix build with system libzip and miniupnpc

Core/FileLoaders/ZipFileLoader.cpp

@@ -1,4 +1,8 @@
-#include <ext/libzip/zip.h>
+#ifdef SHARED_LIBZIP
+#include <zip.h>
+#else
+#include "ext/libzip/zip.h"
+#endif
 
 #include "Core/FileLoaders/LocalFileLoader.h"
 #include "Core/FileLoaders/ZipFileLoader.h"

Core/FileLoaders/ZipFileLoader.h

@@ -2,7 +2,11 @@
 
 #include <mutex>
 
-#include <ext/libzip/zip.h>
+#ifdef SHARED_LIBZIP
+#include <zip.h>
+#else
+#include "ext/libzip/zip.h"
+#endif
 
 #include "Common/CommonTypes.h"
 #include "Common/Log.h"

Core/Loaders.h

@@ -20,7 +20,11 @@
 #include <string>
 #include <memory>
 
+#ifdef SHARED_LIBZIP
+#include <zip.h>
+#else
 #include "ext/libzip/zip.h"
+#endif
 #include "Common/CommonTypes.h"
 #include "Common/File/Path.h"
 

Core/Util/PortManager.h

@@ -22,9 +22,9 @@
 #pragma once
 
 #ifdef USE_SYSTEM_MINIUPNPC
-#include <miniupnpc/include/miniwget.h>
-#include <miniupnpc/include/miniupnpc.h>
-#include <miniupnpc/include/upnpcommands.h>
+#include <miniupnpc/miniwget.h>
+#include <miniupnpc/miniupnpc.h>
+#include <miniupnpc/upnpcommands.h>
 #else
 #ifndef MINIUPNP_STATICLIB
 #define MINIUPNP_STATICLIB