From 84bf1cc7ac8cbfe3a830e70510bfd97e196cb1b0 Mon Sep 17 00:00:00 2001 From: ArchercatNEO Date: Wed, 27 Nov 2024 15:37:54 +0000 Subject: [PATCH] Fix broken includes when compiling with builtin_miniupnpc=false Fixes #99196 Supersedes #99218 --- modules/upnp/SCsub | 1 + modules/upnp/upnp_device_miniupnp.cpp | 2 +- modules/upnp/upnp_miniupnp.cpp | 4 ++-- modules/upnp/upnp_miniupnp.h | 2 +- thirdparty/README.md | 3 ++- thirdparty/miniupnpc/include/{ => miniupnpc}/igd_desc_parse.h | 0 thirdparty/miniupnpc/include/{ => miniupnpc}/miniupnpc.h | 0 .../miniupnpc/include/{ => miniupnpc}/miniupnpc_declspec.h | 0 thirdparty/miniupnpc/include/{ => miniupnpc}/miniupnpctypes.h | 0 thirdparty/miniupnpc/include/{ => miniupnpc}/miniwget.h | 0 .../miniupnpc/include/{ => miniupnpc}/portlistingparse.h | 0 thirdparty/miniupnpc/include/{ => miniupnpc}/upnpcommands.h | 0 thirdparty/miniupnpc/include/{ => miniupnpc}/upnpdev.h | 0 thirdparty/miniupnpc/include/{ => miniupnpc}/upnpreplyparse.h | 0 14 files changed, 7 insertions(+), 5 deletions(-) rename thirdparty/miniupnpc/include/{ => miniupnpc}/igd_desc_parse.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/miniupnpc.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/miniupnpc_declspec.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/miniupnpctypes.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/miniwget.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/portlistingparse.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/upnpcommands.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/upnpdev.h (100%) rename thirdparty/miniupnpc/include/{ => miniupnpc}/upnpreplyparse.h (100%) diff --git a/modules/upnp/SCsub b/modules/upnp/SCsub index ba4a842cb61..98a13dbf6ef 100644 --- a/modules/upnp/SCsub +++ b/modules/upnp/SCsub @@ -35,6 +35,7 @@ if env["builtin_miniupnpc"] and env["platform"] != "web": env_upnp.Append(CPPDEFINES=["MINIUPNPC_SET_SOCKET_TIMEOUT"]) env_thirdparty = env_upnp.Clone() + env_thirdparty.Prepend(CPPPATH=[thirdparty_dir + "include/miniupnpc"]) env_thirdparty.disable_warnings() env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) env.modules_sources += thirdparty_obj diff --git a/modules/upnp/upnp_device_miniupnp.cpp b/modules/upnp/upnp_device_miniupnp.cpp index 46319f83d35..a1e61df4003 100644 --- a/modules/upnp/upnp_device_miniupnp.cpp +++ b/modules/upnp/upnp_device_miniupnp.cpp @@ -34,7 +34,7 @@ #include "upnp_miniupnp.h" -#include +#include void UPNPDeviceMiniUPNP::make_default() { UPNPDevice::_create = UPNPDeviceMiniUPNP::_create; diff --git a/modules/upnp/upnp_miniupnp.cpp b/modules/upnp/upnp_miniupnp.cpp index 0714d56a08f..f4a8cdc85be 100644 --- a/modules/upnp/upnp_miniupnp.cpp +++ b/modules/upnp/upnp_miniupnp.cpp @@ -34,8 +34,8 @@ #include "upnp_device_miniupnp.h" -#include -#include +#include +#include #include diff --git a/modules/upnp/upnp_miniupnp.h b/modules/upnp/upnp_miniupnp.h index 0c7dba9d0be..82120b01b05 100644 --- a/modules/upnp/upnp_miniupnp.h +++ b/modules/upnp/upnp_miniupnp.h @@ -35,7 +35,7 @@ #include "upnp.h" -#include +#include class UPNPMiniUPNP : public UPNP { GDCLASS(UPNPMiniUPNP, UPNP); diff --git a/thirdparty/README.md b/thirdparty/README.md index 291ab1164d6..02c8707217e 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -628,7 +628,8 @@ to solve some MSVC warnings. See the patches in the `patches` directory. Files extracted from upstream source: -- Copy `miniupnpc/src` and `miniupnpc/include` to `thirdparty/miniupnpc` +- `miniupnpc/src/` as `src/` +- `miniupnpc/include/` as `include/miniupnpc/` - Remove the following test or sample files: `listdevices.c,minihttptestserver.c,miniupnpcmodule.c,upnpc.c,upnperrors.*,test*` - `LICENSE` diff --git a/thirdparty/miniupnpc/include/igd_desc_parse.h b/thirdparty/miniupnpc/include/miniupnpc/igd_desc_parse.h similarity index 100% rename from thirdparty/miniupnpc/include/igd_desc_parse.h rename to thirdparty/miniupnpc/include/miniupnpc/igd_desc_parse.h diff --git a/thirdparty/miniupnpc/include/miniupnpc.h b/thirdparty/miniupnpc/include/miniupnpc/miniupnpc.h similarity index 100% rename from thirdparty/miniupnpc/include/miniupnpc.h rename to thirdparty/miniupnpc/include/miniupnpc/miniupnpc.h diff --git a/thirdparty/miniupnpc/include/miniupnpc_declspec.h b/thirdparty/miniupnpc/include/miniupnpc/miniupnpc_declspec.h similarity index 100% rename from thirdparty/miniupnpc/include/miniupnpc_declspec.h rename to thirdparty/miniupnpc/include/miniupnpc/miniupnpc_declspec.h diff --git a/thirdparty/miniupnpc/include/miniupnpctypes.h b/thirdparty/miniupnpc/include/miniupnpc/miniupnpctypes.h similarity index 100% rename from thirdparty/miniupnpc/include/miniupnpctypes.h rename to thirdparty/miniupnpc/include/miniupnpc/miniupnpctypes.h diff --git a/thirdparty/miniupnpc/include/miniwget.h b/thirdparty/miniupnpc/include/miniupnpc/miniwget.h similarity index 100% rename from thirdparty/miniupnpc/include/miniwget.h rename to thirdparty/miniupnpc/include/miniupnpc/miniwget.h diff --git a/thirdparty/miniupnpc/include/portlistingparse.h b/thirdparty/miniupnpc/include/miniupnpc/portlistingparse.h similarity index 100% rename from thirdparty/miniupnpc/include/portlistingparse.h rename to thirdparty/miniupnpc/include/miniupnpc/portlistingparse.h diff --git a/thirdparty/miniupnpc/include/upnpcommands.h b/thirdparty/miniupnpc/include/miniupnpc/upnpcommands.h similarity index 100% rename from thirdparty/miniupnpc/include/upnpcommands.h rename to thirdparty/miniupnpc/include/miniupnpc/upnpcommands.h diff --git a/thirdparty/miniupnpc/include/upnpdev.h b/thirdparty/miniupnpc/include/miniupnpc/upnpdev.h similarity index 100% rename from thirdparty/miniupnpc/include/upnpdev.h rename to thirdparty/miniupnpc/include/miniupnpc/upnpdev.h diff --git a/thirdparty/miniupnpc/include/upnpreplyparse.h b/thirdparty/miniupnpc/include/miniupnpc/upnpreplyparse.h similarity index 100% rename from thirdparty/miniupnpc/include/upnpreplyparse.h rename to thirdparty/miniupnpc/include/miniupnpc/upnpreplyparse.h