Move Asar in CMakeLists

This commit is contained in:
Justin Scofield
2022-08-06 13:19:38 -04:00
parent b0370b5c0d
commit 84b3b231f6
2 changed files with 16 additions and 17 deletions

View File

@@ -28,12 +28,6 @@ find_package(PNG REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
# Asar Assembly ---------------------------------------------------------------
add_subdirectory(src/lib/asar/src)
get_target_property(ASAR_INCLUDE_DIR asar-static INCLUDE_DIRECTORIES)
include_directories(${ASAR_INCLUDE_DIR})
add_definitions(-Dstricmp=strcasecmp)
# 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)

View File

@@ -34,6 +34,11 @@ set(
${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp
) )
# Asar Assembly ---------------------------------------------------------------
add_subdirectory(lib/asar/src)
get_target_property(ASAR_INCLUDE_DIR asar-static INCLUDE_DIRECTORIES)
add_definitions(-Dstricmp=strcasecmp)
set( set(
YAZE_APP_CORE_SRC YAZE_APP_CORE_SRC
app/core/common.cc app/core/common.cc
@@ -67,7 +72,7 @@ set(
set( set(
YAZE_APP_ASM_SRC YAZE_APP_ASM_SRC
app/asm/script.h app/asm/script.cc
) )
set( set(
@@ -79,16 +84,16 @@ set(
) )
add_executable( add_executable(
yaze yaze
yaze.cc yaze.cc
app/rom.cc app/rom.cc
${YAZE_APP_ASM_SRC} ${YAZE_APP_ASM_SRC}
${YAZE_APP_CORE_SRC} ${YAZE_APP_CORE_SRC}
${YAZE_APP_EDITOR_SRC} ${YAZE_APP_EDITOR_SRC}
${YAZE_APP_GFX_SRC} ${YAZE_APP_GFX_SRC}
${YAZE_APP_ZELDA3_SRC} ${YAZE_APP_ZELDA3_SRC}
${YAZE_GUI_SRC} ${YAZE_GUI_SRC}
${IMGUI_SRC} ${IMGUI_SRC}
) )
target_include_directories( target_include_directories(