Merge branch 'electronstudio:master' into master

sDos280 · web-flow · commit 227e122f763c · 2022-10-25T20:32:07.000+03:00
diff --git a/pyray/__init__.py b/pyray/__init__.py
@@ -43,7 +43,7 @@ def makefunc(a):
     def func(*args):
         modified_args = []
         for (c_arg, arg) in zip(ffi.typeof(a).args, args):
-            # print("arg:",str(arg), "c_arg.kind:", c_arg.kind, "c_arg:", c_arg, "type(arg):",str(type(arg)))
+            #print("arg:",str(arg), "c_arg.kind:", c_arg.kind, "c_arg:", c_arg, "type(arg):",str(type(arg)))
             if c_arg.kind == 'pointer':
                 if type(arg) == str:
                     arg = arg.encode('utf-8')
@@ -53,6 +53,8 @@ def func(*args):
                     arg = ffi.new("int *", arg)
                 elif type(arg) is float:
                     arg = ffi.new("float *", arg)
+                elif type(arg) is list  and str(c_arg) == "<ctype 'char * *'>":
+                    arg = [ffi.new("char[]", x.encode('utf-8')) for x in arg]
                 elif str(type(arg)) == "<class '_cffi_backend.__CDataOwn'>" and "*" not in str(arg):  # CPython
                     arg = ffi.addressof(arg)
                 elif str(type(arg)) == "<class '_cffi_backend._CDataBase'>" and "*" not in str(arg):  # Pypy
diff --git a/raylib/build.py b/raylib/build.py
@@ -170,11 +170,11 @@ def build_unix():
 
 def build_windows():
     print("BUILDING FOR WINDOWS")
-    ffibuilder.cdef(open("raylib/raylib.h.modified").read().replace("bool", "int"))
-    ffibuilder.cdef(open("raylib/rlgl.h.modified").read().replace("bool", "int"))
-    ffibuilder.cdef(open("raylib/raygui.h.modified").read().replace("bool", "int"))
-    ffibuilder.cdef(open("raylib/physac.h.modified").read().replace("bool", "int"))
-    ffibuilder.cdef(open("raylib/raymath.h.modified").read().replace("bool", "int"))
+    ffibuilder.cdef(open("raylib/raylib.h.modified").read())
+    ffibuilder.cdef(open("raylib/rlgl.h.modified").read())
+    ffibuilder.cdef(open("raylib/raygui.h.modified").read())
+    ffibuilder.cdef(open("raylib/physac.h.modified").read())
+    ffibuilder.cdef(open("raylib/raymath.h.modified").read())
     ffibuilder.set_source("raylib._raylib_cffi", """
     #include "raylib.h"
     #include "rlgl.h" 
diff --git a/version.py b/version.py
@@ -1 +1 @@
-__version__ = "4.2.1.1"
+__version__ = "4.2.1.2"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "4.2.1.1"`
	`1`	`+__version__ = "4.2.1.2"`