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

Merge branch 'master' into mosaic-editor

Browse Source
This commit is contained in:
Justin Scofield
2022-08-06 13:21:44 -04:00
committed by GitHub
parent 89e87720ca e76f26f5ad
commit 123ff298d5
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -31,5 +31,6 @@ find_package(GLEW REQUIRED)
# Project Files # Project Files
add_subdirectory(src/lib/abseil-cpp) add_subdirectory(src/lib/abseil-cpp)
add_subdirectory(src/lib/SDL) add_subdirectory(src/lib/SDL)
add_subdirectory(src/lib/asar/src)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(test) add_subdirectory(test)

3
src/CMakeLists.txt
View File

@@ -39,6 +39,8 @@ add_subdirectory(lib/asar/src)
get_target_property(ASAR_INCLUDE_DIR asar-static INCLUDE_DIRECTORIES) get_target_property(ASAR_INCLUDE_DIR asar-static INCLUDE_DIRECTORIES)
add_definitions(-Dstricmp=strcasecmp) add_definitions(-Dstricmp=strcasecmp)
# executable linkage ----------------------------------------------------------
set( set(
YAZE_APP_CORE_SRC YAZE_APP_CORE_SRC
app/core/common.cc app/core/common.cc
@@ -94,7 +96,6 @@ add_executable(
${YAZE_APP_ZELDA3_SRC} ${YAZE_APP_ZELDA3_SRC}
${YAZE_GUI_SRC} ${YAZE_GUI_SRC}
${IMGUI_SRC} ${IMGUI_SRC}
)
target_include_directories( target_include_directories(
yaze PUBLIC yaze PUBLIC