More tweaks

kunitoki · Dec 11, 2024 · b200beb · b200beb
1 parent e92e5d7
commit b200beb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 31 deletions.
diff --git a/cmake/yup_audio_plugin.cmake b/cmake/yup_audio_plugin.cmake
@@ -37,8 +37,8 @@ function (yup_audio_plugin)
     include (FetchContent)
 
     if (NOT "${yup_platform}" MATCHES "^(emscripten)$")
-        _yup_fetch_glfw3()
-        list (APPEND additional_libraries glfw)
+        _yup_fetch_sdl2()
+        list (APPEND additional_libraries SDL2-static)
 
         # ==== Fetch plugins SDKS
         if (YUP_ARG_PLUGIN_CREATE_CLAP)

diff --git a/cmake/yup_dependencies.cmake b/cmake/yup_dependencies.cmake
@@ -19,26 +19,6 @@
 
 #==============================================================================
 
-function (_yup_fetch_glfw3)
-    FetchContent_Declare (glfw
-        GIT_REPOSITORY https://github.com/kunitoki/glfw.git
-        GIT_TAG dev/android_support
-        GIT_SHALLOW TRUE
-        GIT_PROGRESS TRUE)
-
-    set (GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
-    set (GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set (GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    set (GLFW_BUILD_WAYLAND OFF CACHE BOOL "" FORCE)
-    set (GLFW_INSTALL OFF CACHE STRING "" FORCE)
-
-    FetchContent_MakeAvailable (glfw)
-
-    set_target_properties (glfw PROPERTIES FOLDER "Thirdparty")
-endfunction()
-
-#==============================================================================
-
 function (_yup_fetch_sdl2)
     FetchContent_Declare (sdl
         GIT_REPOSITORY https://github.com/libsdl-org/SDL.git

diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp
@@ -75,10 +75,6 @@
 #include <deque>
 #include <mutex>
 
-#elif JUCE_ANDROID
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-
 #endif
 
 //==============================================================================

diff --git a/modules/yup_graphics/native/yup_GraphicsContext_gl.cpp b/modules/yup_graphics/native/yup_GraphicsContext_gl.cpp
@@ -27,8 +27,7 @@
 #include "rive/renderer/gl/render_target_gl.hpp"
 
 #if RIVE_DESKTOP_GL || JUCE_ANDROID
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
+#include <SDL2/sdl.h>
 #endif
 
 namespace yup
@@ -78,7 +77,7 @@ class LowLevelRenderContextGL : public GraphicsContext
     {
 #if RIVE_DESKTOP_GL
         // Load the OpenGL API using glad.
-        if (! gladLoadCustomLoader ((GLADloadproc) glfwGetProcAddress))
+        if (! gladLoadCustomLoader ((GLADloadproc) SDL_GL_GetProcAddress))
         {
             fprintf (stderr, "Failed to initialize glad.\n");
             exit (-1);

diff --git a/modules/yup_gui/native/yup_Windowing_sdl2.cpp b/modules/yup_gui/native/yup_Windowing_sdl2.cpp
@@ -1489,7 +1489,7 @@ void Desktop::updateDisplays()
 
 void initialiseYup_Windowing()
 {
-    // Initialise glfw
+    // Initialise SDL2
     if (SDL_Init (SDL_INIT_VIDEO) != 0)
     {
         DBG ("Error initialising SDL");

diff --git a/modules/yup_gui/yup_gui.cpp b/modules/yup_gui/yup_gui.cpp
@@ -80,5 +80,4 @@
 #endif
 
 //==============================================================================
-//#include "native/yup_Windowing_glfw.cpp"
 #include "native/yup_Windowing_sdl2.cpp"