diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-04-08 15:08:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 15:08:17 -0400 |
| commit | 2a6400716c1e17b65507cd2a433192f81cd402df (patch) | |
| tree | eb034ad74fab1e337b422d387e8e9a8b62bfb098 /python/olm_build.py | |
| parent | fcfa5f12a4cd482973fdf03000af4a26a360dc2e (diff) | |
| parent | 709687a7b56d6768831766459940b6f0bb078d85 (diff) | |
Merge branch 'master' into poljar/python-sas
Diffstat (limited to 'python/olm_build.py')
| -rw-r--r-- | python/olm_build.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/python/olm_build.py b/python/olm_build.py index 1c610a1..0606337 100644 --- a/python/olm_build.py +++ b/python/olm_build.py @@ -18,6 +18,7 @@ from __future__ import unicode_literals import os +import subprocess from cffi import FFI @@ -32,6 +33,8 @@ link_args = ["-L../build"] if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]: link_args.append('-Wl,-rpath=../build') +headers_build = subprocess.Popen("make headers", shell=True) +headers_build.wait() ffibuilder.set_source( "_libolm", @@ -39,6 +42,7 @@ ffibuilder.set_source( #include <olm/olm.h> #include <olm/inbound_group_session.h> #include <olm/outbound_group_session.h> + #include <olm/pk.h> #include <olm/sas.h> """, libraries=["olm"], @@ -48,6 +52,9 @@ ffibuilder.set_source( with open(os.path.join(PATH, "include/olm/olm.h")) as f: ffibuilder.cdef(f.read(), override=True) +with open(os.path.join(PATH, "include/olm/pk.h")) as f: + ffibuilder.cdef(f.read(), override=True) + with open(os.path.join(PATH, "include/olm/sas.h")) as f: ffibuilder.cdef(f.read(), override=True) |