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

Merge pull request #2 from scawful/remove-sneshacking

Browse Source 
Remove sneshacking library
This commit is contained in:
Justin Scofield
2022-07-30 00:32:14 -04:00
committed by GitHub
parent b2eac1cde2 f69f804601
commit 19fa3abd38
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/CMakeLists.txt
View File

@@ -1,5 +1,4 @@
include_directories(lib/cmake) include_directories(lib/cmake)
include_directories(/usr/local/Cellar/libpng/1.6.37/include/libpng16/)
# find libraries -------------------------------------------------------------------------------------------------- # find libraries --------------------------------------------------------------------------------------------------
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
@@ -27,11 +26,6 @@ add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES})
target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH}) target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH})
target_compile_definitions(ImGuiColorTextEdit PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> GL_GLEXT_PROTOTYPES=1) target_compile_definitions(ImGuiColorTextEdit PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> GL_GLEXT_PROTOTYPES=1)
set(SNESHACKING_PATH "lib/sneshacking/src")
file(GLOB SNESHACKING_SOURCES ${SNESHACKING_PATH}/*.c)
add_library("NintendoCompression" STATIC ${SNESHACKING_SOURCES})
target_include_directories(NintendoCompression PUBLIC "/usr/local/Cellar/libpng/1.6.37/include/libpng16")
# Executable Linkage -------------------------------------------------------------------------------------- # Executable Linkage --------------------------------------------------------------------------------------
add_executable( add_executable(
yaze yaze
@@ -66,21 +60,13 @@ add_executable(
${IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp ${IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp
${IMGUI_FILE_DLG_PATH}/ImGuiFileDialog.cpp ${IMGUI_FILE_DLG_PATH}/ImGuiFileDialog.cpp
${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp
${SNESHACKING_PATH}/compressions/alttpcompression.c
${SNESHACKING_PATH}/compressions/stdnintendo.c
${SNESHACKING_PATH}/tile.c
${SNESHACKING_PATH}/tilepng.c
${SNESHACKING_PATH}/palette.c
${SNESHACKING_PATH}/rommapping.c
${SNESHACKING_PATH}/mapping_lorom.c
) )
target_include_directories( target_include_directories(
yaze PUBLIC yaze PUBLIC
${CMAKE_SOURCE_DIR}/src/
lib/ lib/
app/ app/
${SNESHACKING_PATH} ${CMAKE_SOURCE_DIR}/src/
${PNG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}
${GLEW_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS}
@@ -106,7 +92,6 @@ target_link_libraries(
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
ImGui ImGui
NintendoCompression
) )
set_target_properties(yaze set_target_properties(yaze

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

@@ -2,7 +2,6 @@
#define YAZE_APP_DATA_OVERWORLD_H #define YAZE_APP_DATA_OVERWORLD_H
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <rommapping.h>
#include <memory> #include <memory>
#include <vector> #include <vector>