Merge pull request #1 from lambda-pixel/sdl

Support for Linux

Author: lambda-pixel

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "3rdparty/imgui/imgui"]
 	path = 3rdparty/imgui/imgui
 	url = https://github.com/ocornut/imgui.git
+[submodule "3rdparty/SDL_mixer"]
+	path = 3rdparty/SDL_mixer
+	url = https://github.com/libsdl-org/SDL_mixer.git
+[submodule "3rdparty/SDL"]
+	path = 3rdparty/SDL
+	url = https://github.com/libsdl-org/SDL.git

3rdparty/CMakeLists.txt

@@ -1 +1,14 @@
-add_subdirectory(imgui)
+add_subdirectory(imgui)
+
+if (USE_SDL OR USE_SDL_MIXER)
+    if (WIN32)
+        set(SDL_SHARED ON CACHE BOOL "" FORCE)
+        set(SDL_STATIC ON CACHE BOOL "" FORCE)
+    endif()
+
+    add_subdirectory(SDL)
+endif()
+
+if (USE_SDL_MIXER)
+    add_subdirectory(SDL_mixer)
+endif()

3rdparty/SDL

@@ -1,15 +1,31 @@
 find_package(Vulkan REQUIRED)
 
-add_library(imgui    
-    imgui/imgui.cpp
-    imgui/imgui_draw.cpp
-    imgui/imgui_tables.cpp
-    imgui/imgui_widgets.cpp
-    imgui/backends/imgui_impl_win32.cpp
-    imgui/backends/imgui_impl_vulkan.cpp
-    #imgui/imgui_demo.cpp
-)
+if (USE_SDL)
+    add_library(imgui
+        imgui/imgui.cpp
+        imgui/imgui_draw.cpp
+        imgui/imgui_tables.cpp
+        imgui/imgui_widgets.cpp
+        imgui/backends/imgui_impl_sdl3.cpp
+        imgui/backends/imgui_impl_vulkan.cpp
+        #imgui/imgui_demo.cpp
+    )
+else()
+    add_library(imgui
+        imgui/imgui.cpp
+        imgui/imgui_draw.cpp
+        imgui/imgui_tables.cpp
+        imgui/imgui_widgets.cpp
+        imgui/backends/imgui_impl_win32.cpp
+        imgui/backends/imgui_impl_vulkan.cpp
+        #imgui/imgui_demo.cpp
+    )
+endif()
 
 target_include_directories(imgui PUBLIC imgui)
 
-target_link_libraries(imgui PUBLIC Vulkan::Vulkan)
+target_link_libraries(imgui PUBLIC Vulkan::Vulkan)
+
+if (USE_SDL)
+    target_link_libraries(imgui PUBLIC SDL3::SDL3)
+endif()

3rdparty/SDL_mixer

@@ -7,18 +7,42 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 
 option(BUILD_MEDICORP "Build with MediCorp support" OFF)
 
+# On Linux, we always use SDL Mixer
+if (WIN32)
+    option(USE_SDL "Use SDL library for window management backend" OFF)
+    option(USE_SDL_MIXER "Use SDL Mixer audio backend" OFF)
+else()
+    set(USE_SDL ON CACHE BOOL "Use SDL library for window management backend" FORCE)
+    set(USE_SDL_MIXER ON CACHE BOOL "Use SDL Mixer audio backend" FORCE)
+endif()
+
 include(GNUInstallDirs)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/plugins)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+# Configuration
+configure_file(cmake/config.h.in config.h @ONLY)
 
+if (BUILD_MEDICORP)
+    message(STATUS "Building with MediCorp support")
+endif()
+
+# Build
+add_subdirectory(3rdparty)
+add_subdirectory(assets)
+add_subdirectory(plugins)
+add_subdirectory(src)
+
+# CPack
 set(CPACK_PACKAGE_NAME "EDVoice")
 set(CPACK_PACKAGE_VENDOR "Siegfried Origin")
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
 set(CPACK_GENERATOR "ZIP")
-
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+# Remove source, can be problematic on WIN32 with SDL_Mixer
+set(CPACK_SOURCE_GENERATOR "")
 
 execute_process(
     COMMAND git describe --tags --abbrev=0
@@ -33,8 +57,3 @@ else()
 endif()
 
 include(CPack)
-
-add_subdirectory(3rdparty)
-add_subdirectory(assets)
-add_subdirectory(plugins)
-add_subdirectory(src)

3rdparty/imgui/CMakeLists.txt

@@ -0,0 +1,3 @@
+#cmakedefine USE_SDL_MIXER
+#cmakedefine USE_SDL
+#cmakedefine BUILD_MEDICORP

CMakeLists.txt

@@ -99,8 +99,10 @@ typedef struct {
 } PluginCallbacks;
 
 // Each plugin must implement these functions to register its callbacks
+#ifdef _WIN32
 __declspec(dllexport) void registerPlugin(PluginCallbacks* callbacks);
 __declspec(dllexport) void unregisterPlugin();
+#endif
 
 #ifdef __cplusplus
 }
@@ -110,6 +112,7 @@ __declspec(dllexport) void unregisterPlugin();
 #include <cstring>
 #endif
 
+#ifdef _WIN32
 // Macro to define plugin registration boilerplate for EventLogger
 #define DECLARE_PLUGIN(ClassName, _name, _versionStr, _author) \
     static void loadConfig(const char* filepath, void* ctx) { \
@@ -141,3 +144,7 @@ __declspec(dllexport) void unregisterPlugin();
         delete g_plugin; \
     } \
     }
+#else
+// TODO Linux
+#define DECLARE_PLUGIN(ClassName, _name, _versionStr, _author)
+#endif

cmake/config.h.in

@@ -21,36 +21,50 @@ set(EDVOICE_SOURCES_GUI
     GUI/Vulkan/VkAdapter.cpp
     GUI/Vulkan/Swapchain.cpp
     GUI/Vulkan/VkUtil.cpp
+
+    GUI/WindowSystem.cpp
 )
 
-# GUI version
-add_executable(EDVoice WIN32 ${EDVOICE_SOURCES} ${EDVOICE_SOURCES_GUI})
+if (WIN32)
+    # GUI version
+    add_executable(EDVoice WIN32 ${EDVOICE_SOURCES} ${EDVOICE_SOURCES_GUI})
+
+    # CLI version without GUI
+    add_executable(EDVoice-cli WIN32 ${EDVOICE_SOURCES})
+
+    target_include_directories(EDVoice-cli PRIVATE ../3rdparty)
+    target_include_directories(EDVoice-cli PRIVATE ../plugins/include)
+    target_include_directories(EDVoice-cli PRIVATE ${CMAKE_BINARY_DIR})
+    target_compile_definitions(EDVoice-cli PRIVATE UNICODE _UNICODE)
+    
+    install(TARGETS EDVoice-cli DESTINATION .)
+else()
+    # GUI version
+    add_executable(EDVoice ${EDVOICE_SOURCES} ${EDVOICE_SOURCES_GUI})
+endif()
 
 target_compile_definitions(EDVoice PRIVATE GUI_MODE)
 
 target_include_directories(EDVoice PRIVATE ../3rdparty)
 target_include_directories(EDVoice PRIVATE ../plugins/include)
-
-target_link_libraries(EDVoice PRIVATE imgui)
+target_include_directories(EDVoice PRIVATE ${CMAKE_BINARY_DIR})
 target_compile_definitions(EDVoice PRIVATE UNICODE _UNICODE)
+target_link_libraries(EDVoice PRIVATE imgui)
 
-# CLI version without GUI
-add_executable(EDVoice-cli WIN32 ${EDVOICE_SOURCES})
-
-target_include_directories(EDVoice-cli PRIVATE ../3rdparty)
-target_include_directories(EDVoice-cli PRIVATE ../plugins/include)
+if (USE_SDL OR USE_SDL_MIXER)
+    target_link_libraries(EDVoice PRIVATE SDL3::SDL3)
+endif()
 
-target_compile_definitions(EDVoice-cli PRIVATE UNICODE _UNICODE)
+if (USE_SDL_MIXER)
+    target_link_libraries(EDVoice PRIVATE SDL3_mixer::SDL3_mixer)
+endif()
 
-if (BUILD_MEDICORP)
-    message(STATUS "Building with MediCorp support")
+install(TARGETS EDVoice DESTINATION .)
 
-    target_compile_definitions(EDVoice PRIVATE BUILD_MEDICORP)
-    target_compile_definitions(EDVoice-cli PRIVATE BUILD_MEDICORP)
+if (WIN32 AND (USE_SDL OR USE_SDL_MIXER))
+    install(FILES $<TARGET_FILE:SDL3::SDL3-shared> DESTINATION .)
 endif()
 
-# target_compile_definitions(EDVoice PRIVATE BUILD_MEDICORP)
-# target_compile_definitions(EDVoice PRIVATE VULKAN_DEBUG_LAYER)
-
-install(TARGETS EDVoice EDVoice-cli
-        RUNTIME DESTINATION .)
+if (WIN32 AND USE_SDL_MIXER)
+    install(FILES $<TARGET_FILE:SDL3_mixer::SDL3_mixer-shared> DESTINATION .)
+endif()