Merge remote-tracking branch 'origin/master'

This commit is contained in:
richard 2021-06-13 00:37:27 +01:00
commit 92a9d87108
7 changed files with 25396 additions and 7 deletions

View file

@ -1,4 +1,4 @@
# Python Bindings for Raylib 3.5 # Python Bindings for Raylib 3.7
New CFFI API static bindings. Faster, fewer bugs and easier to maintain than ctypes. New CFFI API static bindings. Faster, fewer bugs and easier to maintain than ctypes.

BIN
raylib.lib Normal file

Binary file not shown.

View file

@ -6,8 +6,8 @@ materials of a model. But now it __seems__ to work
import platform import platform
# Probably unnecessary, just covering all bases in case people add or remove dlls # Probably unnecessary, just covering all bases in case people add or remove dlls
MAC_NAMES = ['libraylib.3.0.0.dylib', 'libraylib.301.dylib', 'libraylib.dylib'] MAC_NAMES = ['libraylib.3.5.0.dylib', 'libraylib.301.dylib', 'libraylib.dylib']
LINUX_NAMES = ['libraylib.so.3.0.0','libraylib.so.3', 'libraylib.so'] LINUX_NAMES = ['libraylib.so.3.5.0','libraylib.so.3', 'libraylib.so']
WINDOWS_NAMES = ['libraylib.dll', 'raylib.dll','32bit/raylib.dll', '32bit/libraylib.dll'] WINDOWS_NAMES = ['libraylib.dll', 'raylib.dll','32bit/raylib.dll', '32bit/libraylib.dll']
if platform.system() == "Darwin": if platform.system() == "Darwin":

Binary file not shown.

25389
raylib/static/_raylib_cffi.c Normal file

File diff suppressed because it is too large Load diff

View file

@ -26,10 +26,10 @@ def build_windows():
ffibuilder.cdef(open("raylib/raylib_modified.h").read().replace('RLAPI ', '').replace('bool','int')) ffibuilder.cdef(open("raylib/raylib_modified.h").read().replace('RLAPI ', '').replace('bool','int'))
ffibuilder.set_source("raylib.static._raylib_cffi", ffibuilder.set_source("raylib.static._raylib_cffi",
""" """
#include "../../raylib/raylib.h" #include "../../../raylib/raylib.h"
""", """,
extra_link_args=['/NODEFAULTLIB:MSVCRTD'], extra_link_args=['/NODEFAULTLIB:MSVCRTD'],
libraries=['raylib_static', 'gdi32', 'shell32', 'user32','OpenGL32', 'winmm'], libraries=['raylib', 'gdi32', 'shell32', 'user32','OpenGL32', 'winmm'],
) )
if __name__ == "__main__": if __name__ == "__main__":
ffibuilder.compile(verbose=True) ffibuilder.compile(verbose=True)

View file

@ -16,7 +16,7 @@ class BinaryDistribution(Distribution):
# This call to setup() does all the work # This call to setup() does all the work
setup( setup(
name="raylib", name="raylib",
version="3.5.0", version="3.7.0",
description="Python CFFI bindings for Raylib", description="Python CFFI bindings for Raylib",
long_description=README, long_description=README,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
@ -34,7 +34,7 @@ setup(
], ],
packages=["raylib", "raylib.dynamic", "raylib.static"], packages=["raylib", "raylib.dynamic", "raylib.static"],
include_package_data=True, include_package_data=True,
install_requires=["cffi>=1.14.0","inflection"], install_requires=["cffi>=1.14.5","inflection"],
distclass=BinaryDistribution, distclass=BinaryDistribution,
cffi_modules=["raylib/static/build.py:ffibuilder"], # this would build libs whenever the module is installed, but we are distributing static libs instead cffi_modules=["raylib/static/build.py:ffibuilder"], # this would build libs whenever the module is installed, but we are distributing static libs instead
) )