scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build SDL from source

Browse Source
This commit is contained in:
Justin Scofield
2022-07-30 12:15:08 -04:00
parent 51351508e7
commit 332bf5f3f3
18 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -16,3 +16,9 @@
[submodule "src/lib/abseil-cpp"] [submodule "src/lib/abseil-cpp"]
path = src/lib/abseil-cpp path = src/lib/abseil-cpp
url = https://github.com/abseil/abseil-cpp.git 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

7
CMakeLists.txt
View File

@@ -23,8 +23,13 @@ set(ABSL_CXX_STANDARD 17)
set(ABSL_USE_GOOGLETEST_HEAD ON) set(ABSL_USE_GOOGLETEST_HEAD ON)
set(ABSL_ENABLE_INSTALL 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 # Project Files
add_subdirectory(src/lib/abseil-cpp)
add_subdirectory(src/lib/SDL)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(test) add_subdirectory(test)

9
src/CMakeLists.txt
View File

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

2
src/app/core/controller.cc
View File

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

2
src/app/core/controller.h
View File

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

2
src/app/editor/master_editor.cc
View File

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

2
src/app/editor/master_editor.h
View File

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

2
src/app/gfx/bitmap.cc
View File

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

2
src/app/gfx/bitmap.h
View File

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

2
src/app/gfx/pseudo_vram.h
View File

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

2
src/app/gfx/snes_palette.cc
View File

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

2
src/app/gfx/snes_palette.h
View File

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

2
src/app/rom.cc
View File

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

2
src/app/rom.h
View File

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

2
src/app/zelda3/overworld.h
View File

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

1
src/lib/SDL Submodule

Submodule src/lib/SDL added at 2241bd669f

1
src/yaze.cc
View File

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

4
test/CMakeLists.txt
View File

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