diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 13:31:52 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 14:37:52 +0100 |
| commit | 9d8a9ea826ac733e7076d567ef2a6b5200de68c4 (patch) | |
| tree | 86c063a81caf98a48bdc3137306a4c62fb723ab3 /platform | |
| parent | 1e255532e90fa35148167e4c153ad39f77010a04 (diff) | |
assimp: Clean and document buildsystem, prepare for unbundling
- Improve the SCsub to allow unbundling and remove unnecessary code.
- Move files around to match upstream source.
- Re-sync with upstream commit 308db73d0b3c2d1870cd3e465eaa283692a4cf23
to ensure we don't have local modifications.
- Doesn't actually build against current version 5.0.1 due to the lack
of the new ArmaturePopulate API that Gordon authored. We'll have to
wait for a public release with that API (5.1?) to enable unbundling.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/server/detect.py | 4 | ||||
| -rw-r--r-- | platform/x11/detect.py | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index ef94dc436c..db9ba8d036 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -163,6 +163,10 @@ def configure(env): sys.exit(255) env.ParseConfig('pkg-config bullet --cflags --libs') + if False: # not env['builtin_assimp']: + # FIXME: Add min version check + env.ParseConfig('pkg-config assimp --cflags --libs') + if not env['builtin_enet']: env.ParseConfig('pkg-config libenet --cflags --libs') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 8952aa5e82..9a9ab86068 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -1,7 +1,6 @@ import os import platform import sys -from methods import using_gcc, using_clang def is_active(): @@ -226,6 +225,10 @@ def configure(env): sys.exit(255) env.ParseConfig('pkg-config bullet --cflags --libs') + if False: # not env['builtin_assimp']: + # FIXME: Add min version check + env.ParseConfig('pkg-config assimp --cflags --libs') + if not env['builtin_enet']: env.ParseConfig('pkg-config libenet --cflags --libs') |