From 25ee0ff9cdd42883f430bd5fd98f8dc36d947f03 Mon Sep 17 00:00:00 2001
From: Justin Scofield <justin.scofield@outlook.com>
Date: Fri, 5 Aug 2022 19:30:37 +0000
Subject: [PATCH] Cleanup CMakeLists

---
 CMakeLists.txt      |  7 +++++-
 src/CMakeLists.txt  | 52 ++++++++++++++++++++++++++-------------------
 test/CMakeLists.txt |  2 ++
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36d42414..1a5b3e7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,14 @@ 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)
-add_subdirectory(src/lib/asar/src)
 add_subdirectory(src)
 add_subdirectory(test)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8bed4879..975ffc98 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(lib/cmake)
-
 # gui libraries ---------------------------------------------------------------
 set(IMGUI_PATH  "lib/imgui")
 file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp)
@@ -23,11 +21,18 @@ 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)
 
-# asar assembly ---------------------------------------------------------------
-get_target_property(ASAR_INCLUDE_DIR asar-static INCLUDE_DIRECTORIES)
-include_directories(${ASAR_INCLUDE_DIR})
-
-# executable linkage ----------------------------------------------------------
+set(
+  IMGUI_SRC
+  ${IMGUI_PATH}/imgui.cpp 
+  ${IMGUI_PATH}/imgui_demo.cpp
+  ${IMGUI_PATH}/imgui_draw.cpp 
+  ${IMGUI_PATH}/imgui_widgets.cpp
+  ${IMGUI_PATH}/backends/imgui_impl_sdl.cpp
+  ${IMGUI_PATH}/backends/imgui_impl_sdlrenderer.cpp 
+  ${IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp
+  ${IMGUI_FILE_DLG_PATH}/ImGuiFileDialog.cpp
+  ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp
+)
 
 set(
   YAZE_APP_CORE_SRC
@@ -60,34 +65,37 @@ set(
   app/zelda3/screen.cc
 )
 
+set(
+  YAZE_APP_ASM_SRC
+  app/asm/script.h
+)
+
+set(
+  YAZE_GUI_SRC
+  gui/canvas.cc
+  gui/input.cc
+  gui/style.cc
+  gui/widgets.cc
+)
+
 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}
-    app/rom.cc
-    gui/canvas.cc
-    gui/input.cc
-    gui/style.cc
-    gui/widgets.cc
-    # GUI libraries 
-    ${IMGUI_PATH}/imgui.cpp 
-    ${IMGUI_PATH}/imgui_demo.cpp
-    ${IMGUI_PATH}/imgui_draw.cpp 
-    ${IMGUI_PATH}/imgui_widgets.cpp
-    ${IMGUI_PATH}/backends/imgui_impl_sdl.cpp
-    ${IMGUI_PATH}/backends/imgui_impl_sdlrenderer.cpp 
-    ${IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp
-    ${IMGUI_FILE_DLG_PATH}/ImGuiFileDialog.cpp
-    ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp
+    ${YAZE_GUI_SRC}
+    ${IMGUI_SRC}
 )
 
 target_include_directories(
   yaze PUBLIC
   lib/
   app/
+  ${ASAR_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/src/
   ${PNG_INCLUDE_DIRS}
   ${SDL2_INCLUDE_DIR}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index aa049b21..66023f68 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,6 +15,7 @@ add_executable(
   yaze_test.cc
   rom_test.cc
   ../src/app/rom.cc
+  ../src/app/asm/script.cc
   ../src/app/gfx/bitmap.cc
   ../src/app/gfx/snes_tile.cc
   ../src/app/gfx/snes_palette.cc
@@ -43,6 +44,7 @@ target_link_libraries(
   absl::raw_logging_internal
   SDL2::SDL2
   ${OPENGL_LIBRARIES}
+  asar-static
   gmock_main
   gmock
   gtest_main