hz-b · ichinii · Apr 17, 2025 · Apr 8, 2025 · Apr 8, 2025 · Feb 24, 2025
diff --git a/.github/workflows/testWindows.yml b/.github/workflows/testWindows.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    runs-on: windows-latest
+    runs-on: windows-2025
 
     steps:
       - uses: actions/checkout@v4

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/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 # ---- Project ----
 project(RAYX VERSION 0.21.7)
+if(MSVC)
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+endif()
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CUDA_STANDARD 20)
@@ -15,7 +18,16 @@ option(RAYX_REQUIRE_CUDA "If option 'RAYX_ENABLE_CUDA' is ON, this option will a
 option(RAYX_ENABLE_OPENMP "This option enables the search for OPENMP. Project will be compiled without openmp if not found." ON)
 option(RAYX_REQUIRE_OPENMP "If option 'RAYX_ENABLE_OPENMP' is ON, this option will add the requirement that openmp must be found." OFF)
 option(RAYX_STATIC_LIB "This option builds 'rayx-core' as a static library." OFF)
+# ------------------
+
 
+# ---- Build options ----
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/release)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/lib/release)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/lib/release)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/debug)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/lib/debug)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/lib/debug)
 # ------------------
 
 # ---- Defaults ----

diff --git a/Extern/CMakeLists.txt b/Extern/CMakeLists.txt
@@ -4,7 +4,10 @@ include(CheckLanguage)
 set(gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll" FORCE)
 
 add_subdirectory(googletest)
-add_subdirectory(portable-file-dialogs)
+
+# support version in CMakeLists.txt of portable-file-dialogs was removed from cmake. thus we include the header only library by hand
+add_library(portable_file_dialogs INTERFACE)
+target_include_directories(portable_file_dialogs INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/portable-file-dialogs)
 
 # CLI11
 set(CLI11_SANITIZERS OFF)
@@ -58,3 +61,4 @@ else()
 endif()
 
 add_subdirectory(alpaka)
+add_subdirectory(SDL EXCLUDE_FROM_ALL)
diff --git a/Extern/SDL b/Extern/SDL
diff --git a/Extern/glfw b/Extern/glfw
diff --git a/Intern/CMakeLists.txt b/Intern/CMakeLists.txt
@@ -1,13 +1,5 @@
 cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
-# ---- Build options ----
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/release)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/lib/release)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/lib/release)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/debug)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/lib/debug)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/lib/debug)
-
 # -----------------------
 
 # ---- Enable languages that we need ----

diff --git a/Intern/rayx-ui/CMakeLists.txt b/Intern/rayx-ui/CMakeLists.txt
@@ -11,15 +11,13 @@ 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)
+    file(GLOB_RECURSE SOURCE ${PROJECT_SOURCE_DIR}/src/**.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})
+    add_executable(${PROJECT_NAME} WIN32 ${SOURCE} ${IMGUI_SOURCES})
 
     if(MSVC)
         target_compile_options(${PROJECT_NAME} PRIVATE /W4)
@@ -82,19 +80,9 @@ if(Vulkan_FOUND)
     include(CPack)
     # -----------------
 
-    # ---- GLFW Options ----
-    option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF)
-    option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF)
-    option(GLFW_BUILD_DOCS "Build the GLFW documentation" OFF)
-    option(GLFW_INSTALL "Generate installation target" OFF)
-    option(GLFW_DOCUMENT_INTERNALS "Include internals in documentation" OFF)
-    # ----------------------
-
     # ---- 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 CLI11::CLI11 Vulkan::Vulkan portable_file_dialogs SDL3::SDL3)
     target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE 
-        ${GLFW_DIR}/include
-        ${GLFW_DIR}/deps
         ${IMGUI_DIR}
         ${IMGUI_DIR}/backends
         ${GLM_DIR}