diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-11 13:55:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 13:55:44 +0200 |
| commit | c499f1475f1c37c6d83985320a9e98a3d2711a2b (patch) | |
| tree | 8ceaa6bc1d5deb40b7c5fc998041ecd63ad122d9 /platform | |
| parent | f0bacf360dbb6ce3781356438b2fa7067250d27c (diff) | |
| parent | 99acec63f175fecd7172c927263ed3787cb082d6 (diff) | |
Merge pull request #29418 from AndreaCatania/upbul
Updated Bullet version to the actual bullet master commit
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/server/detect.py | 6 | ||||
| -rw-r--r-- | platform/x11/detect.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index 08c2eb6aaf..a5648d8d9d 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -145,12 +145,12 @@ def configure(env): env.ParseConfig('pkg-config libpng --cflags --libs') if not env['builtin_bullet']: - # We need at least version 2.88 + # We need at least version 2.89 import subprocess bullet_version = subprocess.check_output(['pkg-config', 'bullet', '--modversion']).strip() - if str(bullet_version) < "2.88": + if str(bullet_version) < "2.89": # Abort as system bullet was requested but too old - print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.88")) + print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.89")) sys.exit(255) env.ParseConfig('pkg-config bullet --cflags --libs') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 933ee6b72e..a502308eee 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -219,12 +219,12 @@ def configure(env): env.ParseConfig('pkg-config libpng --cflags --libs') if not env['builtin_bullet']: - # We need at least version 2.88 + # We need at least version 2.89 import subprocess bullet_version = subprocess.check_output(['pkg-config', 'bullet', '--modversion']).strip() - if str(bullet_version) < "2.88": + if str(bullet_version) < "2.89": # Abort as system bullet was requested but too old - print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.88")) + print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.89")) sys.exit(255) env.ParseConfig('pkg-config bullet --cflags --libs') |