GLFW -> SDL3

hz-b · Feb 24, 2025 · 22164be · 22164be
1 parent 2183fd1
commit 22164be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,9 +16,6 @@
 [submodule "Extern/imgui"]
 	path = Extern/imgui
 	url = https://github.com/ocornut/imgui
-[submodule "Extern/glfw"]
-	path = Extern/glfw
-	url = https://github.com/glfw/glfw
 [submodule "Extern/stb"]
 	path = Extern/stb
 	url = https://github.com/nothings/stb
@@ -27,4 +24,7 @@
 	url = https://github.com/alpaka-group/alpaka.git
 [submodule "Extern/portable-file-dialogs"]
 	path = Extern/portable-file-dialogs
-	url = https://github.com/samhocevar/portable-file-dialogs.git
+	url = https://github.com/samhocevar/portable-file-dialogs.git
+[submodule "Extern/SDL"]
+	path = Extern/SDL
+	url = https://github.com/libsdl-org/SDL
diff --git a/Extern/CMakeLists.txt b/Extern/CMakeLists.txt
@@ -44,3 +44,4 @@ else()
 endif()
 
 add_subdirectory(alpaka)
+add_subdirectory(SDL)
diff --git a/Extern/SDL b/Extern/SDL
diff --git a/Extern/glfw b/Extern/glfw
diff --git a/Intern/rayx-ui/CMakeLists.txt b/Intern/rayx-ui/CMakeLists.txt
@@ -11,13 +11,11 @@ if(Vulkan_FOUND)
     project(rayx-ui VERSION ${RAYX_VERSION})
 
     set(IMGUI_DIR ../../Extern/imgui/)
-    set(GLFW_DIR ../../Extern/glfw/)
     set(GLM_DIR ../../Extern/glm/)
     set(STB_DIR ../../Extern/stb/)
-    add_subdirectory(${GLFW_DIR} binary_dir EXCLUDE_FROM_ALL)
 
     file(GLOB_RECURSE SOURCE ${PROJECT_SOURCE_DIR}/src/*.cpp)
-    set(IMGUI_SOURCES ${IMGUI_DIR}/backends/imgui_impl_glfw.cpp ${IMGUI_DIR}/backends/imgui_impl_vulkan.cpp ${IMGUI_DIR}/imgui.cpp ${IMGUI_DIR}/imgui_draw.cpp ${IMGUI_DIR}/imgui_demo.cpp ${IMGUI_DIR}/imgui_tables.cpp ${IMGUI_DIR}/imgui_widgets.cpp)
+    set(IMGUI_SOURCES ${IMGUI_DIR}/backends/imgui_impl_sdl3.cpp ${IMGUI_DIR}/backends/imgui_impl_vulkan.cpp ${IMGUI_DIR}/imgui.cpp ${IMGUI_DIR}/imgui_draw.cpp ${IMGUI_DIR}/imgui_demo.cpp ${IMGUI_DIR}/imgui_tables.cpp ${IMGUI_DIR}/imgui_widgets.cpp)
 
     add_executable(${PROJECT_NAME} ${SOURCE} ${IMGUI_SOURCES})
 
@@ -91,7 +89,7 @@ if(Vulkan_FOUND)
     # ----------------------
 
     # ---- Dependencies ----
-    target_link_libraries(${PROJECT_NAME} PRIVATE rayx-core glfw CLI11::CLI11 Vulkan::Vulkan portable_file_dialogs)
+    target_link_libraries(${PROJECT_NAME} PRIVATE rayx-core glfw CLI11::CLI11 Vulkan::Vulkan portable_file_dialogs SDL3::SDL3)
     target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE 
         ${GLFW_DIR}/include
         ${GLFW_DIR}/deps
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,4 @@ else()
		endif()

		add_subdirectory(alpaka)
		add_subdirectory(SDL)