From 96d1a00ac9faa3dc4c71b585b54b6c9a84b7dd93 Mon Sep 17 00:00:00 2001 From: TSnake41 Date: Sun, 29 Mar 2020 15:41:54 +0200 Subject: [PATCH] Fix building on Linux. --- makefile | 2 ++ tools/genbind.lua | 4 ++-- tools/physac.h | 40 ++++++++++++++++++++-------------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/makefile b/makefile index 81e74ec..57f869a 100644 --- a/makefile +++ b/makefile @@ -11,6 +11,8 @@ MODULES := rlgl physac ifeq ($(OS),Windows_NT) LDFLAGS += -lopengl32 -lgdi32 -lwinmm -static +else + LDFLAGS += -ldl -lX11 -lpthread endif BOOT_FILES := src/raylib.lua src/raylua.lua diff --git a/tools/genbind.lua b/tools/genbind.lua index 3cdd1a4..adaca25 100644 --- a/tools/genbind.lua +++ b/tools/genbind.lua @@ -77,8 +77,8 @@ for _,modname in ipairs(modules) do end) -- Strip spaces - line = line:gsub("([(),*.]) +(%w)", function (a, b) return a .. b end) - line = line:gsub("(%w) +([(),*.])", function (a, b) return a .. b end) + line = line:gsub("([(),*.])%s+(%w)", function (a, b) return a .. b end) + line = line:gsub("(%w)%s+([(),*.])", function (a, b) return a .. b end) proto[#proto + 1] = line:gsub(";", "") end diff --git a/tools/physac.h b/tools/physac.h index be03018..243fcd8 100644 --- a/tools/physac.h +++ b/tools/physac.h @@ -1,20 +1,20 @@ -void InitPhysics(void); -void RunPhysicsStep(void); -void SetPhysicsTimeStep(double delta); -bool IsPhysicsEnabled(void); -void SetPhysicsGravity(float x, float y); -PhysicsBody CreatePhysicsBodyCircle(Vector2 pos, float radius, float density); -PhysicsBody CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density); -PhysicsBody CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density); -void PhysicsAddForce(PhysicsBody body, Vector2 force); -void PhysicsAddTorque(PhysicsBody body, float amount); -void PhysicsShatter(PhysicsBody body, Vector2 position, float force); -int GetPhysicsBodiesCount(void); -PhysicsBody GetPhysicsBody(int index); -int GetPhysicsShapeType(int index); -int GetPhysicsShapeVerticesCount(int index); -Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex); -void SetPhysicsBodyRotation(PhysicsBody body, float radians); -void DestroyPhysicsBody(PhysicsBody body); -void ResetPhysics(void); -void ClosePhysics(void); +void InitPhysics(void); +void RunPhysicsStep(void); +void SetPhysicsTimeStep(double delta); +bool IsPhysicsEnabled(void); +void SetPhysicsGravity(float x, float y); +PhysicsBody CreatePhysicsBodyCircle(Vector2 pos, float radius, float density); +PhysicsBody CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density); +PhysicsBody CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density); +void PhysicsAddForce(PhysicsBody body, Vector2 force); +void PhysicsAddTorque(PhysicsBody body, float amount); +void PhysicsShatter(PhysicsBody body, Vector2 position, float force); +int GetPhysicsBodiesCount(void); +PhysicsBody GetPhysicsBody(int index); +int GetPhysicsShapeType(int index); +int GetPhysicsShapeVerticesCount(int index); +Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex); +void SetPhysicsBodyRotation(PhysicsBody body, float radians); +void DestroyPhysicsBody(PhysicsBody body); +void ResetPhysics(void); +void ClosePhysics(void);