From 1e911f4a053db79711d8f45d33586638813f0c75 Mon Sep 17 00:00:00 2001 From: TSnake41 Date: Tue, 31 Mar 2020 21:33:13 +0200 Subject: [PATCH] Improve building on Linux and fix duplicated API entries. --- makefile | 3 +++ tools/api.h | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 5c6c3d9..a6a9c9d 100644 --- a/makefile +++ b/makefile @@ -39,6 +39,9 @@ raylua_e: src/raylua.o src/raylua_e.o src/raylua_builder.o src/lib/miniz.o raylua.dll: src/raylua.o $(CC) -shared -fPIE -o $@ $^ $(LDFLAGS) +raylua.so: src/raylua.o + $(CC) -shared -fPIE -o $@ $^ $(LDFLAGS) + src/raylua.o: luajit raylib src/autogen/boot.c src/autogen/bind.c src/raylua_builder.o: src/autogen/builder.c diff --git a/tools/api.h b/tools/api.h index c4ff603..655211e 100644 --- a/tools/api.h +++ b/tools/api.h @@ -230,7 +230,6 @@ void ImageDrawLine(Image *dst, int startPosX, int startPosY, int endPosX, int en void ImageDrawLineV(Image *dst, Vector2 start, Vector2 end, Color color); void ImageDrawText(Image *dst, Vector2 position, const char *text, int fontSize, Color color); void ImageDrawTextEx(Image *dst, Vector2 position, Font font, const char *text, float fontSize, float spacing, Color color); -void ImageDrawTextEx(Image *dst, Vector2 position, Font font, const char *text, float fontSize, float spacing, Color color); void ImageFlipVertical(Image *image); void ImageFlipHorizontal(Image *image); void ImageRotateCW(Image *image); @@ -258,8 +257,6 @@ void DrawTextureEx(Texture2D texture, Vector2 position, float rotation, float sc void DrawTextureRec(Texture2D texture, Rectangle sourceRec, Vector2 position, Color tint); void DrawTextureQuad(Texture2D texture, Vector2 tiling, Vector2 offset, Rectangle quad, Color tint); void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle destRec, Vector2 origin, float rotation, Color tint); -void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle destRec, Vector2 origin, float rotation, Color tint); -void DrawTextureNPatch(Texture2D texture, NPatchInfo nPatchInfo, Rectangle destRec, Vector2 origin, float rotation, Color tint); void DrawTextureNPatch(Texture2D texture, NPatchInfo nPatchInfo, Rectangle destRec, Vector2 origin, float rotation, Color tint); Font GetFontDefault(void); Font LoadFont(const char *fileName); @@ -352,7 +349,6 @@ void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle sourceRec, Vec bool CheckCollisionSpheres(Vector3 centerA, float radiusA, Vector3 centerB, float radiusB); bool CheckCollisionBoxes(BoundingBox box1, BoundingBox box2); bool CheckCollisionBoxSphere(BoundingBox box, Vector3 center, float radius); -bool CheckCollisionRaySphere(Ray ray, Vector3 center, float radius); bool CheckCollisionRaySphereEx(Ray ray, Vector3 center, float radius, Vector3 *collisionPoint); bool CheckCollisionRayBox(Ray ray, BoundingBox box); RayHitInfo GetCollisionRayModel(Ray ray, Model model);