timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve compatibility with Windows (though it still doesn't work)

Browse source
This commit is contained in:
Hubert Chathi 2023-04-27 18:52:39 -04:00
parent 5cfe6c3dbd
commit 4b69958c95
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
python/olm_build.py
View file

@ -26,7 +26,6 @@ PATH = os.path.dirname(__file__)
DEVELOP = os.environ.get("DEVELOP") DEVELOP = os.environ.get("DEVELOP")
compile_args = ["-I../include"] compile_args = ["-I../include"]
link_args = ["-L../build"]
if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]: if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]:
link_args.append('-Wl,-rpath=../build') link_args.append('-Wl,-rpath=../build')
@ -44,8 +43,8 @@ ffibuilder.set_source(
#include <olm/sas.h> #include <olm/sas.h>
""", """,
libraries=["olm"], libraries=["olm"],
library_dirs=[os.path.join("..", "build")],
extra_compile_args=compile_args, extra_compile_args=compile_args,
extra_link_args=link_args,
source_extension=".cpp", # we need to link the C++ standard library, so use a C++ extension source_extension=".cpp", # we need to link the C++ standard library, so use a C++ extension
) )

13
python/packaging.diff
View file

@ -12,14 +12,12 @@
+recursive-include libolm/tests * +recursive-include libolm/tests *
--- a/olm_build.py --- a/olm_build.py
+++ b/olm_build.py +++ b/olm_build.py
@@ -25,13 +25,30 @@ @@ -25,12 +25,29 @@
DEVELOP = os.environ.get("DEVELOP") DEVELOP = os.environ.get("DEVELOP")
-compile_args = ["-I../include"] -compile_args = ["-I../include"]
-link_args = ["-L../build"]
+compile_args = ["-Ilibolm/include"] +compile_args = ["-Ilibolm/include"]
+link_args = ["-Llibolm/build"]
if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]: if DEVELOP and DEVELOP.lower() in ["yes", "true", "1"]:
link_args.append('-Wl,-rpath=../build') link_args.append('-Wl,-rpath=../build')
@ -47,3 +45,12 @@
+ subprocess.run(["make", "static"], cwd="libolm", check=True) + subprocess.run(["make", "static"], cwd="libolm", check=True)
ffibuilder.set_source( ffibuilder.set_source(
@@ -43,7 +60,7 @@
#include <olm/sas.h>
""",
libraries=["olm"],
- library_dirs=[os.path.join("..", "build")],
+ library_dirs=[os.path.join("libolm", "build")],
extra_compile_args=compile_args,
source_extension=".cpp", # we need to link the C++ standard library, so use a C++ extension
)