godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbx: Fix include for zlib that broke unbundling 

It's possible to link against system zlib on Linux, so we should use system paths.
This commit is contained in:
Rémi Verschelde 2021-04-22 02:18:44 +02:00
parent f6d5b2f3c2
commit 93b7406138
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/fbx/SCsub
View File

@ -8,6 +8,9 @@ env_fbx = env_modules.Clone()
# Make includes relative to the folder path specified here so our includes are clean # Make includes relative to the folder path specified here so our includes are clean
env_fbx.Prepend(CPPPATH=["#modules/fbx/"]) env_fbx.Prepend(CPPPATH=["#modules/fbx/"])
if env["builtin_zlib"]:
env_fbx.Prepend(CPPPATH=["#thirdparty/zlib/"])
# Godot's own source files # Godot's own source files
env_fbx.add_source_files(env.modules_sources, "tools/*.cpp") env_fbx.add_source_files(env.modules_sources, "tools/*.cpp")
env_fbx.add_source_files(env.modules_sources, "data/*.cpp") env_fbx.add_source_files(env.modules_sources, "data/*.cpp")

2
modules/fbx/fbx_parser/FBXParser.cpp
View File

@ -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 * @brief Implementation of the FBX parser and the rudimentary DOM that we use
*/ */
#include "thirdparty/zlib/zlib.h"
#include <stdlib.h> /* strtol */ #include <stdlib.h> /* strtol */
#include <zlib.h>
#include "ByteSwapper.h" #include "ByteSwapper.h"
#include "FBXParseTools.h" #include "FBXParseTools.h"