generate h files on linux and then use them on windows

Author: electronstudio

create_stub_static.py

@@ -66,6 +66,7 @@ class struct: ...
                 " ", "")+"_"+str(i)
             if 'params' in json_object:
                 p = json_object['params']
+                #print("param_name: ", param_name, "i", i, "params: ",p,file=sys.stderr)
                 param_name = list(p)[i]
             param_type = ctype_to_python_type(arg.cname)
             sig += f"{param_name}: {param_type},"

raylib/build.py

@@ -45,11 +45,15 @@ def pre_process_header(filename):
     print("Pre-processing " + filename)
     file = open(filename, "r")
     filetext = "".join([line for line in file if '#include' not in line])
-    command = ['gcc', '-CC', '-P', '-undef', '-nostdinc', '-DRLAPI=', '-DPHYSACDEF=', '-DRAYGUIDEF=',
+    command = ['gcc', '-CC', '-P', '-undef', '-nostdinc', '-DRL_MATRIX_TYPE',
+               #'-DRL_QUATERNION_TYPE','-DRL_VECTOR4_TYPE','-DRL_VECTOR3_TYPE','-DRL_VECTOR2_TYPE'
+               '-DRLAPI=', '-DPHYSACDEF=', '-DRAYGUIDEF=',
                '-dDI', '-E', '-']
     filetext2 = subprocess.run(command, text=True, input=filetext, stdout=subprocess.PIPE).stdout
     filetext3 = filetext2.replace("va_list", "void *")
     filetext4 = "\n".join([line for line in filetext3.splitlines() if not line.startswith("#")])
+    file = open("raylib/"+os.path.basename(filename)+".modified", "w")
+    file.write(filetext4)
     # print(r)
     return filetext4
 
@@ -65,44 +69,53 @@ def check_header_exists(file):
     return True
 
 
-def mangle(file):
-    result = ""
-    skip = False
-    for line in open(file):
-        line = line.strip().replace("va_list", "void *") + "\n"
-        if skip:
-            if line.startswith("#endif"):
-                skip = False
-            continue
-        if line.startswith("#if defined(__cplusplus)"):
-            skip = True
-            continue
-        if line.startswith("#endif // RAYGUI_H"):
-            break
-        if line.startswith("#"):
-            continue
-        if line.startswith("RLAPI"):
-            line = line.replace('RLAPI ', '')
-        if line.startswith("RAYGUIDEF"):
-            line = line.replace('RAYGUIDEF ', '')
-        if line.startswith("PHYSACDEF"):
-            line = line.replace('PHYSACDEF ', '')
-        result += line
-        # print(line)
-    return result
+# def mangle(file):
+#     result = ""
+#     skip = False
+#     for line in open(file):
+#         line = line.strip().replace("va_list", "void *") + "\n"
+#         if skip:
+#             if line.startswith("#endif"):
+#                 skip = False
+#             continue
+#         if line.startswith("#if defined(__cplusplus)"):
+#             skip = True
+#             continue
+#         if line.startswith("#endif // RAYGUI_H"):
+#             break
+#         if line.startswith("#"):
+#             continue
+#         if line.startswith("RLAPI"):
+#             line = line.replace('RLAPI ', '')
+#         if line.startswith("RAYGUIDEF"):
+#             line = line.replace('RAYGUIDEF ', '')
+#         if line.startswith("PHYSACDEF"):
+#             line = line.replace('PHYSACDEF ', '')
+#         result += line
+#         # print(line)
+#     return result
 
 
 def build_unix():
     if not check_raylib_installed():
         raise Exception("ERROR: raylib not found by pkg-config.  Please install pkg-config and Raylib.")
 
     raylib_h = get_the_include_path() + "/raylib.h"
+    rlgl_h = get_the_include_path() + "/rlgl.h"
+    #raymath_h = get_the_include_path() + "/raymath.h"
 
     if not os.path.isfile(raylib_h):
         raise Exception("ERROR: " + raylib_h + " not found.  Please install Raylib.")
 
+    if not os.path.isfile(rlgl_h):
+        raise Exception("ERROR: " + raylib_h + " not found.  Please install Raylib.")
+
+    #if not os.path.isfile(raymath_h):
+    #    raise Exception("ERROR: " + raylib_h + " not found.  Please install Raylib.")
+
     ffi_includes = """
     #include "raylib.h"
+    #include "rlgl.h"
     """
 
     raygui_h = get_the_include_path() + "/raygui.h"
@@ -121,6 +134,10 @@ def build_unix():
         """
 
     ffibuilder.cdef(pre_process_header(raylib_h))
+    ffibuilder.cdef(pre_process_header(rlgl_h))
+    #ffibuilder.cdef(pre_process_header(raymath_h))
+    #print("******************************\n\n\n")
+    #print(pre_process_header(rlgl_h))
     if os.path.isfile(raygui_h):
         ffibuilder.cdef(pre_process_header(raygui_h))
     if os.path.isfile(physac_h):
@@ -132,30 +149,30 @@ def build_unix():
                            '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework',
                            'CoreVideo']
         libraries = []
-    elif platform.system() == "Linux":
-        if "x86" in platform.machine():
-            print("BUILDING FOR LINUX")
-            extra_link_args = [get_the_lib_path() + '/libraylib.a', '-lm', '-lpthread', '-lGLU', '-lGL',
-                               '-lrt', '-lm', '-ldl', '-lX11', '-lpthread']
-            libraries = ['GL', 'm', 'pthread', 'dl', 'rt', 'X11']
-        elif "arm" in platform.machine():
+    else:  #platform.system() == "Linux":
+        if "arm" in platform.machine():
             print("BUILDING FOR RASPBERRY PI")
             extra_link_args = [get_the_lib_path() + '/libraylib.a',
                                '/opt/vc/lib/libEGL_static.a', '/opt/vc/lib/libGLESv2_static.a',
                                '-L/opt/vc/lib', '-lvcos', '-lbcm_host', '-lbrcmEGL', '-lbrcmGLESv2',
                                '-lm', '-lpthread', '-lrt']
             libraries = []
+        else: #"x86" in platform.machine():
+            print("BUILDING FOR LINUX")
+            extra_link_args = [get_the_lib_path() + '/libraylib.a', '-lm', '-lpthread', '-lGLU', '-lGL',
+                               '-lrt', '-lm', '-ldl', '-lX11', '-lpthread']
+            libraries = ['GL', 'm', 'pthread', 'dl', 'rt', 'X11']
 
     ffibuilder.set_source("raylib._raylib_cffi", ffi_includes, extra_link_args=extra_link_args,
-                          libraries=libraries,
-                          include_dirs=['raylib'])
+                          libraries=libraries)
 
 
 def build_windows():
     print("BUILDING FOR WINDOWS")
-    ffibuilder.cdef(mangle("raylib/raylib.h"))
-    ffibuilder.cdef(open("raylib/raygui_modified.h").read().replace('RAYGUIDEF ', ''))
-    ffibuilder.cdef(open("raylib/physac_modified.h").read().replace('PHYSACDEF ', ''))
+    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.set_source("raylib._raylib_cffi", """
     #include "raylib.h"
     #define RAYGUI_IMPLEMENTATION

raylib/build_multi.sh

@@ -20,5 +20,5 @@ function build() {
 build 3.9.5
 build 3.8.10
 build 3.7.10
-build 3.6.13
+
 

raylib/build_multi_linux.sh

@@ -20,5 +20,5 @@ function build() {
 build 3.9.5
 build 3.8.10
 build 3.7.10
-build 3.6.13
+
 

raylib/build_multi_rpi_nox.sh

@@ -20,5 +20,5 @@ function build() {
 build 3.9.5
 build 3.8.10
 build 3.7.10
-build 3.6.13
+
 

raylib/physac.h.modified

@@ -0,0 +1,170 @@
+/**********************************************************************************************
+*
+*   Physac v1.1 - 2D Physics library for videogames
+*
+*   DESCRIPTION:
+*
+*   Physac is a small 2D physics engine written in pure C. The engine uses a fixed time-step thread loop
+*   to simluate physics. A physics step contains the following phases: get collision information,
+*   apply dynamics, collision solving and position correction. It uses a very simple struct for physic
+*   bodies with a position vector to be used in any 3D rendering API.
+*
+*   CONFIGURATION:
+*
+*   #define PHYSAC_IMPLEMENTATION
+*       Generates the implementation of the library into the included file.
+*       If not defined, the library is in header only mode and can be included in other headers
+*       or source files without problems. But only ONE file should hold the implementation.
+*
+*   #define PHYSAC_STATIC (defined by default)
+*       The generated implementation will stay private inside implementation file and all
+*       internal symbols and functions will only be visible inside that file.
+*
+*   #define PHYSAC_DEBUG
+*       Show debug traces log messages about physic bodies creation/destruction, physic system errors,
+*       some calculations results and NULL reference exceptions
+*
+*   #define PHYSAC_DEFINE_VECTOR2_TYPE
+*       Forces library to define struct Vector2 data type (float x; float y)
+*
+*   #define PHYSAC_AVOID_TIMMING_SYSTEM
+*       Disables internal timming system, used by UpdatePhysics() to launch timmed physic steps,
+*       it allows just running UpdatePhysics() automatically on a separate thread at a desired time step.
+*       In case physics steps update needs to be controlled by user with a custom timming mechanism,
+*       just define this flag and the internal timming mechanism will be avoided, in that case,
+*       timming libraries are neither required by the module.
+*
+*   #define PHYSAC_MALLOC()
+*   #define PHYSAC_CALLOC()
+*   #define PHYSAC_FREE()
+*       You can define your own malloc/free implementation replacing stdlib.h malloc()/free() functions.
+*       Otherwise it will include stdlib.h and use the C standard library malloc()/free() function.
+*
+*   COMPILATION:
+*
+*   Use the following code to compile with GCC:
+*       gcc -o $(NAME_PART).exe $(FILE_NAME) -s -static -lraylib -lopengl32 -lgdi32 -lwinmm -std=c99
+*
+*   VERSIONS HISTORY:
+*       1.1 (20-Jan-2021) @raysan5: Library general revision 
+*               Removed threading system (up to the user)
+*               Support MSVC C++ compilation using CLITERAL()
+*               Review DEBUG mechanism for TRACELOG() and all TRACELOG() messages
+*               Review internal variables/functions naming for consistency
+*               Allow option to avoid internal timming system, to allow app manage the steps
+*       1.0 (12-Jun-2017) First release of the library
+*
+*
+*   LICENSE: zlib/libpng
+*
+*   Copyright (c) 2016-2021 Victor Fisac (@victorfisac) and Ramon Santamaria (@raysan5)
+*
+*   This software is provided "as-is", without any express or implied warranty. In no event
+*   will the authors be held liable for any damages arising from the use of this software.
+*
+*   Permission is granted to anyone to use this software for any purpose, including commercial
+*   applications, and to alter it and redistribute it freely, subject to the following restrictions:
+*
+*     1. The origin of this software must not be misrepresented; you must not claim that you
+*     wrote the original software. If you use this software in a product, an acknowledgment
+*     in the product documentation would be appreciated but is not required.
+*
+*     2. Altered source versions must be plainly marked as such, and must not be misrepresented
+*     as being the original software.
+*
+*     3. This notice may not be removed or altered from any source distribution.
+*
+**********************************************************************************************/
+// Allow custom memory allocators
+//----------------------------------------------------------------------------------
+// Defines and Macros
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+// Data Types Structure Definition
+//----------------------------------------------------------------------------------
+typedef enum PhysicsShapeType { PHYSICS_CIRCLE = 0, PHYSICS_POLYGON } PhysicsShapeType;
+// Previously defined to be used in PhysicsShape struct as circular dependencies
+typedef struct PhysicsBodyData *PhysicsBody;
+// Matrix2x2 type (used for polygon shape rotation matrix)
+typedef struct Matrix2x2 {
+    float m00;
+    float m01;
+    float m10;
+    float m11;
+} Matrix2x2;
+typedef struct PhysicsVertexData {
+    unsigned int vertexCount; // Vertex count (positions and normals)
+    Vector2 positions[24 /* Maximum number of vertex for polygons shapes*/]; // Vertex positions vectors
+    Vector2 normals[24 /* Maximum number of vertex for polygons shapes*/]; // Vertex normals vectors
+} PhysicsVertexData;
+typedef struct PhysicsShape {
+    PhysicsShapeType type; // Shape type (circle or polygon)
+    PhysicsBody body; // Shape physics body data pointer
+    PhysicsVertexData vertexData; // Shape vertices data (used for polygon shapes)
+    float radius; // Shape radius (used for circle shapes)
+    Matrix2x2 transform; // Vertices transform matrix 2x2
+} PhysicsShape;
+typedef struct PhysicsBodyData {
+    unsigned int id; // Unique identifier
+    bool enabled; // Enabled dynamics state (collisions are calculated anyway)
+    Vector2 position; // Physics body shape pivot
+    Vector2 velocity; // Current linear velocity applied to position
+    Vector2 force; // Current linear force (reset to 0 every step)
+    float angularVelocity; // Current angular velocity applied to orient
+    float torque; // Current angular force (reset to 0 every step)
+    float orient; // Rotation in radians
+    float inertia; // Moment of inertia
+    float inverseInertia; // Inverse value of inertia
+    float mass; // Physics body mass
+    float inverseMass; // Inverse value of mass
+    float staticFriction; // Friction when the body has not movement (0 to 1)
+    float dynamicFriction; // Friction when the body has movement (0 to 1)
+    float restitution; // Restitution coefficient of the body (0 to 1)
+    bool useGravity; // Apply gravity force to dynamics
+    bool isGrounded; // Physics grounded on other body state
+    bool freezeOrient; // Physics rotation constraint
+    PhysicsShape shape; // Physics body shape information (type, radius, vertices, transform)
+} PhysicsBodyData;
+typedef struct PhysicsManifoldData {
+    unsigned int id; // Unique identifier
+    PhysicsBody bodyA; // Manifold first physics body reference
+    PhysicsBody bodyB; // Manifold second physics body reference
+    float penetration; // Depth of penetration from collision
+    Vector2 normal; // Normal direction vector from 'a' to 'b'
+    Vector2 contacts[2]; // Points of contact during collision
+    unsigned int contactsCount; // Current collision number of contacts
+    float restitution; // Mixed restitution during collision
+    float dynamicFriction; // Mixed dynamic friction during collision
+    float staticFriction; // Mixed static friction during collision
+} PhysicsManifoldData, *PhysicsManifold;
+//----------------------------------------------------------------------------------
+// Module Functions Declaration
+//----------------------------------------------------------------------------------
+// Physics system management
+extern /* Functions visible from other files*/ void InitPhysics(void); // Initializes physics system
+extern /* Functions visible from other files*/ void UpdatePhysics(void); // Update physics system
+extern /* Functions visible from other files*/ void ResetPhysics(void); // Reset physics system (global variables)
+extern /* Functions visible from other files*/ void ClosePhysics(void); // Close physics system and unload used memory
+extern /* Functions visible from other files*/ void SetPhysicsTimeStep(double delta); // Sets physics fixed time step in milliseconds. 1.666666 by default
+extern /* Functions visible from other files*/ void SetPhysicsGravity(float x, float y); // Sets physics global gravity force
+// Physic body creation/destroy
+extern /* Functions visible from other files*/ PhysicsBody CreatePhysicsBodyCircle(Vector2 pos, float radius, float density); // Creates a new circle physics body with generic parameters
+extern /* Functions visible from other files*/ PhysicsBody CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density); // Creates a new rectangle physics body with generic parameters
+extern /* Functions visible from other files*/ PhysicsBody CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density); // Creates a new polygon physics body with generic parameters
+extern /* Functions visible from other files*/ void DestroyPhysicsBody(PhysicsBody body); // Destroy a physics body
+// Physic body forces
+extern /* Functions visible from other files*/ void PhysicsAddForce(PhysicsBody body, Vector2 force); // Adds a force to a physics body
+extern /* Functions visible from other files*/ void PhysicsAddTorque(PhysicsBody body, float amount); // Adds an angular force to a physics body
+extern /* Functions visible from other files*/ void PhysicsShatter(PhysicsBody body, Vector2 position, float force); // Shatters a polygon shape physics body to little physics bodies with explosion force
+extern /* Functions visible from other files*/ void SetPhysicsBodyRotation(PhysicsBody body, float radians); // Sets physics body shape transform based on radians parameter
+// Query physics info
+extern /* Functions visible from other files*/ PhysicsBody GetPhysicsBody(int index); // Returns a physics body of the bodies pool at a specific index
+extern /* Functions visible from other files*/ int GetPhysicsBodiesCount(void); // Returns the current amount of created physics bodies
+extern /* Functions visible from other files*/ int GetPhysicsShapeType(int index); // Returns the physics body shape type (PHYSICS_CIRCLE or PHYSICS_POLYGON)
+extern /* Functions visible from other files*/ int GetPhysicsShapeVerticesCount(int index); // Returns the amount of vertices of a physics body shape
+extern /* Functions visible from other files*/ Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex); // Returns transformed position of a body shape (body position + vertex transformed position)
+/***********************************************************************************
+*
+*   PHYSAC IMPLEMENTATION
+*
+************************************************************************************/