Skip to content
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.

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

Fix broken includes when compiling with builtin_miniupnpc=false #99556

Merged
merged 1 commit into from
Nov 29, 2024

Conversation

ArchercatNEO
Copy link
Contributor

Fixes #99196

@ArchercatNEO ArchercatNEO requested review from a team as code owners November 22, 2024 19:26
Copy link
Contributor

@radiantgurl radiantgurl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compiled successfully with builtin_miniupnpc=false on Arch Linux 6.11.8-arch1-2

@akien-mga akien-mga changed the title Fix broken includes when compiling with builtin_miniupnpc=false Fix broken includes when compiling with builtin_miniupnpc=false Nov 23, 2024
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Copy link
Contributor

@Repiteo Repiteo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will need a rebase, as well as a minor README.md tweak; otherwise, nice work!

 thirdparty/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/thirdparty/README.md b/thirdparty/README.md
index 7a95e3c724..760ff0a1e6 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`

@akien-mga akien-mga requested a review from Repiteo November 27, 2024 16:07
@akien-mga akien-mga merged commit d146728 into godotengine:master Nov 29, 2024
20 checks passed
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@ArchercatNEO ArchercatNEO deleted the miniupnpc-include branch December 5, 2024 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot build with builtin_miniupnpc=no
4 participants