Build SDL from source

.gitmodules

@@ -16,3 +16,9 @@
 [submodule "src/lib/abseil-cpp"]
 	path = src/lib/abseil-cpp
 	url = https://github.com/abseil/abseil-cpp.git
+[submodule "src/lib/--force"]
+	path = src/lib/--force
+	url = https://github.com/libsdl-org/SDL.git
+[submodule "src/lib/SDL"]
+	path = src/lib/SDL
+	url = https://github.com/libsdl-org/SDL.git

CMakeLists.txt

@@ -23,8 +23,13 @@ set(ABSL_CXX_STANDARD 17)
 set(ABSL_USE_GOOGLETEST_HEAD ON)
 set(ABSL_ENABLE_INSTALL ON)
 
-add_subdirectory(src/lib/abseil-cpp)
+# Video Libraries -------------------------------------------------------------
+find_package(PNG REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(GLEW REQUIRED)
 
 # Project Files
+add_subdirectory(src/lib/abseil-cpp)
+add_subdirectory(src/lib/SDL)
 add_subdirectory(src)
 add_subdirectory(test)

src/CMakeLists.txt

@@ -1,10 +1,5 @@
 include_directories(lib/cmake)
 
-# find libraries --------------------------------------------------------------------------------------------------
-find_package(SDL2 REQUIRED)
-find_package(PNG REQUIRED)
-find_package(OpenGL REQUIRED)
-find_package(GLEW REQUIRED)
 
 # gui libraries ---------------------------------------------------------------------------------------------------
 set(IMGUI_PATH  "lib/imgui")
@@ -86,9 +81,9 @@ target_link_libraries(
   absl::raw_logging_internal
   absl::failure_signal_handler
   absl::flat_hash_map
-  SDL2main
+  SDL2::SDL2main
+  SDL2::SDL2
   ${PNG_LIBRARIES}
-  ${SDL2_LIBRARIES} 
   ${GLEW_LIBRARIES}
   ${OPENGL_LIBRARIES} 
   ImGui

src/app/core/controller.cc

@@ -1,6 +1,6 @@
 #include "controller.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/backends/imgui_impl_sdl.h>
 #include <imgui/backends/imgui_impl_sdlrenderer.h>
 #include <imgui/imgui.h>

src/app/core/controller.h

@@ -2,7 +2,7 @@
 #define YAZE_APP_CORE_CONTROLLER_H
 #define SDL_MAIN_HANDLED
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/backends/imgui_impl_sdl.h>
 #include <imgui/backends/imgui_impl_sdlrenderer.h>
 #include <imgui/imgui.h>

src/app/editor/master_editor.cc

@@ -3,8 +3,8 @@
 #include <ImGuiColorTextEdit/TextEditor.h>
 #include <ImGuiFileDialog/ImGuiFileDialog.h>
 #include <imgui/imgui.h>
-#include <imgui/imgui_memory_editor.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
+#include <imgui_memory_editor.h>
 
 #include "absl/status/status.h"
 #include "app/core/constants.h"

src/app/editor/master_editor.h

@@ -4,8 +4,8 @@
 #include <ImGuiColorTextEdit/TextEditor.h>
 #include <ImGuiFileDialog/ImGuiFileDialog.h>
 #include <imgui/imgui.h>
-#include <imgui/imgui_memory_editor.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
+#include <imgui_memory_editor.h>
 
 #include "absl/status/status.h"
 #include "app/core/constants.h"

src/app/gfx/bitmap.cc

@@ -1,6 +1,6 @@
 #include "bitmap.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstdint>
 #include <memory>

src/app/gfx/bitmap.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GFX_BITMAP_H
 #define YAZE_APP_GFX_BITMAP_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstdint>
 #include <memory>

src/app/gfx/pseudo_vram.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GFX_PSEUDO_VRAM_H
 #define YAZE_APP_GFX_PSEUDO_VRAM_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstdint>
 #include <unordered_map>

src/app/gfx/snes_palette.cc

@@ -1,6 +1,6 @@
 #include "snes_palette.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/imgui.h>
 
 #include <cstdint>

src/app/gfx/snes_palette.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GFX_PALETTE_H
 #define YAZE_APP_GFX_PALETTE_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/imgui.h>
 
 #include <cstdint>

src/app/rom.cc

@@ -1,6 +1,6 @@
 #include "rom.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstddef>
 #include <cstring>

src/app/rom.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_ROM_H
 #define YAZE_APP_ROM_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstddef>
 #include <cstring>

src/app/zelda3/overworld.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_DATA_OVERWORLD_H
 #define YAZE_APP_DATA_OVERWORLD_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <memory>
 #include <vector>

src/yaze.cc

@@ -1,3 +1,4 @@
+#define main SDL_main
 #include "absl/debugging/failure_signal_handler.h"
 #include "absl/debugging/symbolize.h"
 #include "app/core/controller.h"

test/CMakeLists.txt

@@ -10,8 +10,6 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 enable_testing()
 
-find_package(SDL2 REQUIRED)
-
 add_executable(
   yaze_test
   yaze_test.cc
@@ -43,7 +41,7 @@ target_link_libraries(
   absl::config
   absl::core_headers
   absl::raw_logging_internal
-  ${SDL2_LIBRARIES}
+  SDL2::SDL2
   ${OPENGL_LIBRARIES}
   gtest_main
   gtest