RAYLIB: build with SDL3 platform backend

Author: Chris Warren-Smith

configure.ac

@@ -48,6 +48,13 @@ AC_ARG_WITH(ioio,
   [IOIO="yes"],
   [IOIO="no"])
 
+dnl configure SDL3 for raylib
+PKG_CHECK_MODULES([SDL3], [sdl3])
+AC_MSG_CHECKING([for SDL3 library linking])
+SDL3_LIBS=`pkg-config sdl3 --libs --static`
+SDL3_CFLAGS=`pkg-config sdl3 --cflags`
+SDL3_INCLUDE=-I`pkg-config --variable=includedir sdl3`/SDL3
+
 case "${host_os}" in
   *mingw* | *msys*)
     AC_DEFINE(_WIN32, 1, [building for win32])
@@ -70,7 +77,8 @@ case "${host_os}" in
     WEBSOCKET_LDFLAGS=""
     GTK_SERVER_LDFLAGS="`pkg-config --libs gtk+-3.0` -lXm -lXt"
     GTK_SERVER_CPPFLAGS="`pkg-config --cflags gtk+-3.0` -DGTK_SERVER_FFI -DGTK_SERVER_LIBRARY -DGTK_SERVER_UNIX -DGTK_SERVER_GTK3x"
-    RAYLIB_LDFLAGS="-lGL -lm -lpthread -ldl -lrt -lX11 -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon"
+    RAYLIB_CPPFLAGS="${SDL3_INCLUDE} ${SDL3_CFLAGS}"
+    RAYLIB_LDFLAGS="${SDL3_LIBS}"
     JVM_CPPFLAGS="-I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/linux"
     JVM_LDFLAGS="-L/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/server -ljvm"
     NUKLEAR_CPPFLAGS="-D_GLFW_X11=1"
@@ -79,6 +87,7 @@ esac
 AC_SUBST(DEBUG_LDFLAGS)
 AC_SUBST(CLIPBOARD_LDFLAGS)
 AC_SUBST(RAYLIB_LDFLAGS)
+AC_SUBST(RAYLIB_CPPFLAGS)
 AC_SUBST(NUKLEAR_LDFLAGS)
 AC_SUBST(WEBSOCKET_LDFLAGS)
 AC_SUBST(PLATFORM_LDFLAGS)

raylib/Makefile.am

@@ -24,16 +24,14 @@ $(generated): raylib/parser/raylib_api.json mkraylib.bas
 gen: $(generated) README.md
 
 AM_CXXFLAGS=-fno-rtti -std=c++14 -fpermissive
-AM_CPPFLAGS = -Iraylib/src -Iraylib/src/external/glfw/include -Iraylib/src/external/glfw/deps/mingw \
-  -Iraylib/src/external/glfw/src \
-  -DPLATFORM_DESKTOP=1 -DSUPPORT_BUSY_WAIT_LOOP=1 -DSUPPORT_SCREEN_CAPTURE=1 \
-  -DSUPPORT_GIF_RECORDING=1 -DSUPPORT_COMPRESSION_API=1 -D_GLFW_WAYLAND=1 \
+AM_CPPFLAGS = -Iraylib/src @RAYLIB_CPPFLAGS@ \
+  -DPLATFORM_DESKTOP_SDL=1 -DPLATFORM_DESKTOP_SDL3=1 -DSUPPORT_BUSY_WAIT_LOOP=1 -DSUPPORT_SCREEN_CAPTURE=1 \
+  -DSUPPORT_GIF_RECORDING=1 -DSUPPORT_COMPRESSION_API=1 \
   -Wall -Wextra -Wshadow -Wdouble-promotion -Wno-unused-parameter -fPIC
 
 lib_LTLIBRARIES = libraylib.la
 
 libraylib_la_SOURCES = \
-   raylib/src/rglfw.c \
    raylib/src/rmodels.c \
    raylib/src/raudio.c \
    raylib/src/rcore.c \

raylib/main.cpp

@@ -24,10 +24,10 @@
 #pragma GCC diagnostic pop
 #pragma GCC diagnostic pop
 #include <physac/src/physac.h>
-#include <GLFW/glfw3.h>
 #include <cstring>
 
 #include "robin-hood-hashing/src/include/robin_hood.h"
+#include "SDL_events.h"
 #include "include/var.h"
 #include "include/module.h"
 #include "include/param.h"
@@ -1377,18 +1377,15 @@ static int cmd_guiunlock(int argc, slib_par_t *params, var_t *retval) {
   return 1;
 }
 
-static int cmd_poll_events(int argc, slib_par_t *params, var_t *retval) {
-  glfwPollEvents();
-  return 1;
-}
-
 static int cmd_wait_events(int argc, slib_par_t *params, var_t *retval) {
-  float waitMillis = get_param_int(argc, params, 0, -1);
-  if (waitMillis > 0) {
-    glfwWaitEventsTimeout(waitMillis / 1000);
+  auto timeoutMS = get_param_int(argc, params, 0, -1);
+  SDL_Event event;
+  if (timeoutMS > 0) {
+    SDL_WaitEventTimeout(&event, timeoutMS);
   } else {
-    glfwWaitEvents();
+    SDL_WaitEvent(&event);
   }
+  SDL_PushEvent(&event);
   return 1;
 }
 
@@ -1835,7 +1832,6 @@ static FUNC_SIG lib_proc[] = {
   {3, 3, "GUISETSTYLE", cmd_guisetstyle},
   {2, 2, "GUISTATUSBAR", cmd_guistatusbar},
   {0, 0, "GUIUNLOCK", cmd_guiunlock},
-  {0, 0, "POLLEVENTS", cmd_poll_events},
   {0, 1, "WAITEVENTS", cmd_wait_events},
   {0, 0, "CLOSEPHYSICS", cmd_closephysics},
   {1, 1, "DESTROYPHYSICSBODY", cmd_destroyphysicsbody},