diff --git a/linux_libs/core.o b/linux_libs/core.o deleted file mode 100644 index 6a337a0..0000000 Binary files a/linux_libs/core.o and /dev/null differ diff --git a/linux_libs/models.o b/linux_libs/models.o deleted file mode 100644 index 0d8ec5e..0000000 Binary files a/linux_libs/models.o and /dev/null differ diff --git a/linux_libs/raudio.o b/linux_libs/raudio.o deleted file mode 100644 index 5df71c9..0000000 Binary files a/linux_libs/raudio.o and /dev/null differ diff --git a/linux_libs/rglfw.o b/linux_libs/rglfw.o deleted file mode 100644 index 8d769ea..0000000 Binary files a/linux_libs/rglfw.o and /dev/null differ diff --git a/linux_libs/shapes.o b/linux_libs/shapes.o deleted file mode 100644 index 8b4b105..0000000 Binary files a/linux_libs/shapes.o and /dev/null differ diff --git a/linux_libs/text.o b/linux_libs/text.o deleted file mode 100644 index 225d8ad..0000000 Binary files a/linux_libs/text.o and /dev/null differ diff --git a/linux_libs/textures.o b/linux_libs/textures.o deleted file mode 100644 index d538cec..0000000 Binary files a/linux_libs/textures.o and /dev/null differ diff --git a/linux_libs/utils.o b/linux_libs/utils.o deleted file mode 100644 index e72b7c0..0000000 Binary files a/linux_libs/utils.o and /dev/null differ diff --git a/raylib/dynamic/libraylib.so.2.5.0 b/raylib/dynamic/libraylib.so.2.5.0 deleted file mode 100644 index d6670ed..0000000 Binary files a/raylib/dynamic/libraylib.so.2.5.0 and /dev/null differ diff --git a/raylib/dynamic/libraylib.so.2.6.0 b/raylib/dynamic/libraylib.so.2.6.0 new file mode 100644 index 0000000..a3852b2 Binary files /dev/null and b/raylib/dynamic/libraylib.so.2.6.0 differ diff --git a/raylib/static/_raylib_cffi.c b/raylib/static/_raylib_cffi.c index 5d2b1d2..0b78736 100644 --- a/raylib/static/_raylib_cffi.c +++ b/raylib/static/_raylib_cffi.c @@ -538,7 +538,7 @@ static void (*_cffi_call_python_org)(struct _cffi_externpy_s *, char *); /************************************************************/ - #include "../raylib.h" // the C header of the library, supplied by us here + #include "../raylib.h" // the C header, installed in the system include dir we assume /************************************************************/ diff --git a/raylib/static/_raylib_cffi.cpython-35m-x86_64-linux-gnu.so b/raylib/static/_raylib_cffi.cpython-35m-x86_64-linux-gnu.so deleted file mode 100755 index eddd444..0000000 Binary files a/raylib/static/_raylib_cffi.cpython-35m-x86_64-linux-gnu.so and /dev/null differ diff --git a/raylib/static/_raylib_cffi.cpython-36m-x86_64-linux-gnu.so b/raylib/static/_raylib_cffi.cpython-36m-x86_64-linux-gnu.so index 58c1fb3..1fbe481 100755 Binary files a/raylib/static/_raylib_cffi.cpython-36m-x86_64-linux-gnu.so and b/raylib/static/_raylib_cffi.cpython-36m-x86_64-linux-gnu.so differ diff --git a/raylib/static/_raylib_cffi.cpython-37m-x86_64-linux-gnu.so b/raylib/static/_raylib_cffi.cpython-37m-x86_64-linux-gnu.so index ae36e62..e2ef2ba 100755 Binary files a/raylib/static/_raylib_cffi.cpython-37m-x86_64-linux-gnu.so and b/raylib/static/_raylib_cffi.cpython-37m-x86_64-linux-gnu.so differ diff --git a/raylib/static/_raylib_cffi.cpython-38-x86_64-linux-gnu.so b/raylib/static/_raylib_cffi.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..8c0b6ca Binary files /dev/null and b/raylib/static/_raylib_cffi.cpython-38-x86_64-linux-gnu.so differ diff --git a/raylib/static/build_linux.py b/raylib/static/build_linux.py index d9719a7..0a6db28 100644 --- a/raylib/static/build_linux.py +++ b/raylib/static/build_linux.py @@ -1,4 +1,5 @@ # Linux build assumes raylib, GL, etc are all already installed as system libraries. We dont distribute them. +# Raylib must be installed the compiled with: cmake -DWITH_PIC=ON -DSHARED=ON -DSTATIC=ON .. from cffi import FFI import os @@ -11,9 +12,9 @@ ffibuilder.cdef(open("../raylib_modified.h").read().replace('RLAPI ', '')) ffibuilder.set_source("_raylib_cffi", """ - #include "../raylib.h" // the C header, installed in the system include dir we assume + #include "../raylib.h" """, - extra_link_args=['../../linux_libs/core.o', '../../linux_libs/models.o', '../../linux_libs/raudio.o', '../../linux_libs/rglfw.o','../../linux_libs/shapes.o','../../linux_libs/text.o','../../linux_libs/textures.o','../../linux_libs/utils.o','-lm', '-lpthread', '-lGLU', '-lGL', '-lrt', '-lm', '-ldl', '-lX11', '-lpthread'], + extra_link_args=['/usr/local/lib/libraylib.a','-lm', '-lpthread', '-lGLU', '-lGL', '-lrt', '-lm', '-ldl', '-lX11', '-lpthread'], libraries=['GL','m','pthread', 'dl', 'rt', 'X11'] ) diff --git a/raylib/static/build_linux_multi.sh b/raylib/static/build_linux_multi.sh new file mode 100755 index 0000000..bf591e9 --- /dev/null +++ b/raylib/static/build_linux_multi.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +rm *linux-gnu.so +pyenv global 3.8.1 +pip3 install cffi +python build_linux.py +pyenv global 3.7.6 +pip3 install cffi +python build_linux.py +pyenv global 3.6.10 +pip3 install cffi +python build_linux.py