diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-22 16:53:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 16:53:06 +0200 |
| commit | 4753b309a89036f76dabed4d66227e006a460e1c (patch) | |
| tree | b7ec30e1e17e169b10cbddc977111dcb980202f7 | |
| parent | 3f270022d2c1c14062bdc22f1c63d2d8bc21dd58 (diff) | |
| parent | 93b74061387075909d1b4d29b0e5b2924e06f7d7 (diff) | |
Merge pull request #48074 from akien-mga/fbx-fix-zlib-unbundling
fbx: Fix include for zlib that broke unbundling
| -rw-r--r-- | modules/fbx/SCsub | 3 | ||||
| -rw-r--r-- | modules/fbx/fbx_parser/FBXParser.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/fbx/SCsub b/modules/fbx/SCsub index 84220a66fa..0311fddfee 100644 --- a/modules/fbx/SCsub +++ b/modules/fbx/SCsub @@ -8,6 +8,9 @@ env_fbx = env_modules.Clone() # Make includes relative to the folder path specified here so our includes are clean env_fbx.Prepend(CPPPATH=["#modules/fbx/"]) +if env["builtin_zlib"]: + env_fbx.Prepend(CPPPATH=["#thirdparty/zlib/"]) + # Godot's own source files env_fbx.add_source_files(env.modules_sources, "tools/*.cpp") env_fbx.add_source_files(env.modules_sources, "data/*.cpp") diff --git a/modules/fbx/fbx_parser/FBXParser.cpp b/modules/fbx/fbx_parser/FBXParser.cpp index 82d532e0b8..2a76c3f67c 100644 --- a/modules/fbx/fbx_parser/FBXParser.cpp +++ b/modules/fbx/fbx_parser/FBXParser.cpp @@ -74,8 +74,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief Implementation of the FBX parser and the rudimentary DOM that we use */ -#include "thirdparty/zlib/zlib.h" #include <stdlib.h> /* strtol */ +#include <zlib.h> #include "ByteSwapper.h" #include "FBXParseTools.h" |