From 84b3b231f699fa01b13fabb629ca20c8150e98f6 Mon Sep 17 00:00:00 2001 From: Justin Scofield <47263509+scawful@users.noreply.github.com> Date: Sat, 6 Aug 2022 13:19:38 -0400 Subject: [PATCH] Move Asar in CMakeLists --- CMakeLists.txt | 6 ------ src/CMakeLists.txt | 27 ++++++++++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a5b3e7d..319d028e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,12 +28,6 @@ find_package(PNG REQUIRED) find_package(OpenGL 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 add_subdirectory(src/lib/abseil-cpp) add_subdirectory(src/lib/SDL) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 975ffc98..3b2da4b4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,6 +34,11 @@ set( ${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( YAZE_APP_CORE_SRC app/core/common.cc @@ -67,7 +72,7 @@ set( set( YAZE_APP_ASM_SRC - app/asm/script.h + app/asm/script.cc ) set( @@ -79,16 +84,16 @@ set( ) add_executable( - yaze - yaze.cc - app/rom.cc - ${YAZE_APP_ASM_SRC} - ${YAZE_APP_CORE_SRC} - ${YAZE_APP_EDITOR_SRC} - ${YAZE_APP_GFX_SRC} - ${YAZE_APP_ZELDA3_SRC} - ${YAZE_GUI_SRC} - ${IMGUI_SRC} + yaze + yaze.cc + app/rom.cc + ${YAZE_APP_ASM_SRC} + ${YAZE_APP_CORE_SRC} + ${YAZE_APP_EDITOR_SRC} + ${YAZE_APP_GFX_SRC} + ${YAZE_APP_ZELDA3_SRC} + ${YAZE_GUI_SRC} + ${IMGUI_SRC} ) target_include_directories(