wip4

pfeodrippe · Jul 22, 2024 · 6dab895 · 6dab895
1 parent 95ad456
commit 6dab895
Show file tree

Hide file tree

Showing 4 changed files with 459 additions and 412 deletions.
diff --git a/bin/jextract-libs.sh b/bin/jextract-libs.sh
@@ -4,12 +4,42 @@ set -ex
 
 unameOut="$(uname -s)"
 case "${unameOut}" in
-    Linux*)     VYBE_EXTENSION=so;    __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";                VYBE_GCC_FLECS_OPTS="-std=gnu99 -fPIC"; VYBE_GCC_END="";         VYBE_GCC_RAYLIB="";           VYBE_LIB_PREFIX="lib";;
-    Darwin*)    VYBE_EXTENSION=dylib; __VYBE_DEFAULT_GCC_ARGS="gcc -undefined dynamic_lookup"; VYBE_GCC_FLECS_OPTS="-std=gnu99";       VYBE_GCC_END="";         VYBE_GCC_RAYLIB="";           VYBE_LIB_PREFIX="lib";;
-    CYGWIN*)    VYBE_EXTENSION=dll;   __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";                VYBE_GCC_FLECS_OPTS="-std=gnu99";       VYBE_GCC_END="-lws2_32"; VYBE_GCC_RAYLIB="-static-libgcc -lopengl32 -lgdi32 -lwinmm"; VYBE_LIB_PREFIX="";;
-    MINGW*)     VYBE_EXTENSION=dll;   __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";                VYBE_GCC_FLECS_OPTS="-std=gnu99";       VYBE_GCC_END="-lws2_32"; VYBE_GCC_RAYLIB="-static-libgcc -lopengl32 -lgdi32 -lwinmm"; VYBE_LIB_PREFIX="";;
-    MSYS_NT*)   VYBE_EXTENSION=dll;   __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";                VYBE_GCC_FLECS_OPTS="-std=gnu99";       VYBE_GCC_END="-lws2_32"; VYBE_GCC_RAYLIB="-static-libgcc -lopengl32 -lgdi32 -lwinmm"; VYBE_LIB_PREFIX="";;
-    *)          VYBE_EXTENSION="UNKNOWN:${unameOut}"
+    Linux*)
+        VYBE_EXTENSION=so;
+        __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";
+        VYBE_GCC_FLECS_OPTS="-std=gnu99 -fPIC"; VYBE_GCC_END="";
+        VYBE_GCC_RAYLIB="";
+        VYBE_LIB_PREFIX="lib";;
+    Darwin*)
+        VYBE_EXTENSION=dylib;
+        __VYBE_DEFAULT_GCC_ARGS="gcc -undefined dynamic_lookup";
+        VYBE_GCC_FLECS_OPTS="-std=gnu99";
+        VYBE_GCC_END="";
+        VYBE_GCC_RAYLIB="";
+        VYBE_LIB_PREFIX="lib";;
+    CYGWIN*)
+        VYBE_EXTENSION=dll;
+        __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";
+        VYBE_GCC_FLECS_OPTS="-std=gnu99";
+        VYBE_GCC_END="-lws2_32";
+        VYBE_GCC_RAYLIB="-lopengl32 -lgdi32 -lwinmm";
+        VYBE_LIB_PREFIX="";;
+    MINGW*)
+        VYBE_EXTENSION=dll;
+        __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";
+        VYBE_GCC_FLECS_OPTS="-std=gnu99";
+        VYBE_GCC_END="-lws2_32";
+        VYBE_GCC_RAYLIB="-lopengl32 -lgdi32 -lwinmm";
+        VYBE_LIB_PREFIX="";;
+    MSYS_NT*)
+        VYBE_EXTENSION=dll;
+        __VYBE_DEFAULT_GCC_ARGS="gcc -undefined";
+        VYBE_GCC_FLECS_OPTS="-std=gnu99";
+        VYBE_GCC_END="-lws2_32";
+        VYBE_GCC_RAYLIB="-lopengl32 -lgdi32 -lwinmm";
+        VYBE_LIB_PREFIX="";;
+    *)
+        VYBE_EXTENSION="UNKNOWN:${unameOut}"
 esac
 
 __VYBE_JEXTRACT_DEFAULT=~/Downloads/jextract-osx/bin/jextract

diff --git a/bin/vybe_raylib.c b/bin/vybe_raylib.c
@@ -2,6 +2,51 @@
 #include "../raylib/src/rlgl.h"
 #include "../raylib/src/raymath.h"
 
+// FOR WINDOWS
+#if defined(_WIN32)
+
+#define GLAD_MALLOC RL_MALLOC
+#define GLAD_FREE RL_FREE
+
+#define GLAD_GL_IMPLEMENTATION
+#include "external/glad.h"          // GLAD extensions loading library, includes OpenGL headers
+
+#include "raylib.h"
+#include "rlgl.h"
+#include "raymath.h"
+
+#else
+// OSX and LINUX
+void *malloc(unsigned long size);
+unsigned long strlen(const char *str);
+char* strcpy(char* destination, const char* source);
+
+void glGetProgramiv(	int program,
+                        int pname,
+                        int *params);
+void glGetActiveUniform(	int program,
+                                int index,
+                                int bufSize,
+                                int *length,
+                                int *size,
+                                int *type,
+                                char  *name);
+
+void glGetActiveAttrib(	int program,
+                        int index,
+                        int bufSize,
+                        int *length,
+                        int *size,
+                        int *type,
+                        char *name);
+int glGetUniformLocation(	int program,
+                                const char *name);
+int glGetAttribLocation(	int program,
+                                const char *name);
+
+#endif
+
+
 #define VY_GL_ACTIVE_UNIFORMS GL_ACTIVE_UNIFORMS
 #define VY_GL_ACTIVE_ATTRIBUTES GL_ACTIVE_ATTRIBUTES
 
@@ -61,34 +106,6 @@ VyShaderParameters VyGlGetActiveParameters(int id);
 int VyGlGetActiveUniformsCount(int id);
 int VyGlGetActiveAttributesCount(int id);
 
-void *malloc(unsigned long size);
-unsigned long strlen(const char *str);
-char* strcpy(char* destination, const char* source);
-
-void glGetProgramiv(	int program,
-                        int pname,
-                        int *params);
-void glGetActiveUniform(	int program,
-                                int index,
-                                int bufSize,
-                                int *length,
-                                int *size,
-                                int *type,
-                                char  *name);
-
-void glGetActiveAttrib(	int program,
-                        int index,
-                        int bufSize,
-                        int *length,
-                        int *size,
-                        int *type,
-                        char *name);
-int glGetUniformLocation(	int program,
-                                const char *name);
-int glGetAttribLocation(	int program,
-                                const char *name);
-
-
 VyShaderParameters VyGlGetActiveParameters(int id)
 {
     int namelen = -1;

diff --git a/src-java/org/vybe/flecs/flecs_1.java b/src-java/org/vybe/flecs/flecs_1.java
@@ -42839,13 +42839,13 @@ public static long __DARWIN_C_LEVEL() {
     }
     /**
      * {@snippet lang=c :
-     * #define __ASSERT_FILE_NAME "jextract$5349203350397059923.h"
+     * #define __ASSERT_FILE_NAME "jextract$10271739112655021310.h"
      * }
      */
     public static MemorySegment __ASSERT_FILE_NAME() {
         class Holder {
             static final MemorySegment __ASSERT_FILE_NAME
-                = flecs.LIBRARY_ARENA.allocateFrom("jextract$5349203350397059923.h");
+                = flecs.LIBRARY_ARENA.allocateFrom("jextract$10271739112655021310.h");
         }
         return Holder.__ASSERT_FILE_NAME;
     }