summaryrefslogtreecommitdiff
path: root/platform/x11/detect.py
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-06 16:01:33 +0100
committerGitHub <noreply@github.com>2020-03-06 16:01:33 +0100
commit62afc3c12c2acfbd5f9bbaf93f86111e4d2f3ce0 (patch)
tree501c31a479e01cdca37377404ca728f36a0232d2 /platform/x11/detect.py
parent54fa07e7f01b21bc69309172b439bc05db571977 (diff)
parent78b22393a8dd182ee56d0448ed77ba4430de5e75 (diff)
Merge pull request #36852 from akien-mga/assimp-unbundle
assimp: Clean and document buildsystem, update to upstream 0201fc5
Diffstat (limited to 'platform/x11/detect.py')
-rw-r--r--platform/x11/detect.py5
1 files changed, 4 insertions, 1 deletions
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')