e94161dada
Since we clone the environments to build thirdparty code, we don't get an
explicit dependency on the build objects produced by that environment.
So when we update thirdparty code, Godot code using it is not necessarily
rebuilt (I think it is for changed headers, but not for changed .c/.cpp files),
which can lead to an invalid compilation output (linking old Godot .o files
with a newer, potentially ABI breaking version of thirdparty code).
This was only seen as really problematic with bullet updates (leading to
crashes when rebuilding Godot after a bullet update without cleaning .o files),
but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate.
(cherry picked from commit c7b53c03ae)
49 lines
1.2 KiB
Python
49 lines
1.2 KiB
Python
#!/usr/bin/env python
|
|
|
|
Import("env")
|
|
Import("env_modules")
|
|
|
|
env_upnp = env_modules.Clone()
|
|
|
|
# Thirdparty source files
|
|
|
|
thirdparty_obj = []
|
|
|
|
if env["builtin_miniupnpc"]:
|
|
thirdparty_dir = "#thirdparty/miniupnpc/"
|
|
thirdparty_sources = [
|
|
"igd_desc_parse.c",
|
|
"miniupnpc.c",
|
|
"minixml.c",
|
|
"minisoap.c",
|
|
"minissdpc.c",
|
|
"miniwget.c",
|
|
"upnpcommands.c",
|
|
"upnpdev.c",
|
|
"upnpreplyparse.c",
|
|
"connecthostport.c",
|
|
"portlistingparse.c",
|
|
"receivedata.c",
|
|
"addr_is_reserved.c",
|
|
]
|
|
thirdparty_sources = [thirdparty_dir + "miniupnpc/" + file for file in thirdparty_sources]
|
|
|
|
env_upnp.Prepend(CPPPATH=[thirdparty_dir])
|
|
env_upnp.Append(CPPDEFINES=["MINIUPNP_STATICLIB"])
|
|
env_upnp.Append(CPPDEFINES=["MINIUPNPC_SET_SOCKET_TIMEOUT"])
|
|
|
|
env_thirdparty = env_upnp.Clone()
|
|
env_thirdparty.disable_warnings()
|
|
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
|
|
env.modules_sources += thirdparty_obj
|
|
|
|
|
|
# Godot source files
|
|
|
|
module_obj = []
|
|
|
|
env_upnp.add_source_files(module_obj, "*.cpp")
|
|
env.modules_sources += module_obj
|
|
|
|
# Needed to force rebuilding the module files when the thirdparty library is updated.
|
|
env.Depends(module_obj, thirdparty_obj)
|