From 2e8f14ee6ee5e05070c7539d9c6ef43e282a96c3 Mon Sep 17 00:00:00 2001
From: Justin Scofield <justin.scofield@outlook.com>
Date: Thu, 4 Aug 2022 23:14:45 +0000
Subject: [PATCH] Add Asar and organize CMakeLists.txt

---
 .gitmodules        |  3 ++
 CMakeLists.txt     |  1 +
 src/CMakeLists.txt | 69 ++++++++++++++++++++++++++++++++--------------
 src/lib/asar       |  1 +
 4 files changed, 54 insertions(+), 20 deletions(-)
 create mode 160000 src/lib/asar

diff --git a/.gitmodules b/.gitmodules
index 8910036c..956da4d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "src/lib/SDL"]
 	path = src/lib/SDL
 	url = https://github.com/libsdl-org/SDL.git
+[submodule "src/lib/asar"]
+	path = src/lib/asar
+	url = https://github.com/RPGHacker/asar.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 319d028e..36d42414 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,5 +31,6 @@ find_package(GLEW REQUIRED)
 # 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 9946651d..8bed4879 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,44 +1,72 @@
 include_directories(lib/cmake)
 
-# gui libraries ---------------------------------------------------------------------------------------------------
+# gui libraries ---------------------------------------------------------------
 set(IMGUI_PATH  "lib/imgui")
 file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp)
 add_library("ImGui" STATIC ${IMGUI_SOURCES})
 target_include_directories("ImGui" PUBLIC ${IMGUI_PATH})
 target_include_directories(ImGui PUBLIC ${SDL2_INCLUDE_DIR})
-target_compile_definitions(ImGui PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h>  GL_GLEXT_PROTOTYPES=1)
+target_compile_definitions(ImGui PUBLIC 
+  IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h>  GL_GLEXT_PROTOTYPES=1)
 
 set(IMGUI_FILE_DLG_PATH "lib/ImGuiFileDialog")
 file(GLOB IMGUI_FILE_DLG_SOURCES ${IMGUI_FILE_DLG_PATH}/*.cpp)
 add_library("ImGuiFileDialog" STATIC ${IMGUI_FILE_DLG_SOURCES})
 target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH})
-target_compile_definitions(ImGuiFileDialog PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h>  GL_GLEXT_PROTOTYPES=1)
+target_compile_definitions(ImGuiFileDialog PUBLIC 
+  IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h>  GL_GLEXT_PROTOTYPES=1)
 
 set(IMGUI_COLOR_TEXT_EDIT_PATH "lib/ImGuiColorTextEdit")
 file(GLOB IMGUI_COLOR_TEXT_EDIT_SOURCES ${IMGUI_COLOR_TEXT_EDIT_PATH}/*.cpp)
 add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES})
 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)
+
+# asar assembly ---------------------------------------------------------------
+get_target_property(ASAR_INCLUDE_DIR asar-static INCLUDE_DIRECTORIES)
+include_directories(${ASAR_INCLUDE_DIR})
+
+# executable linkage ----------------------------------------------------------
+
+set(
+  YAZE_APP_CORE_SRC
+  app/core/common.cc
+  app/core/controller.cc
+)
+
+set(
+  YAZE_APP_EDITOR_SRC
+  app/editor/assembly_editor.cc
+  app/editor/dungeon_editor.cc
+  app/editor/master_editor.cc
+  app/editor/overworld_editor.cc
+  app/editor/palette_editor.cc
+  app/editor/screen_editor.cc
+)
+
+set(
+  YAZE_APP_GFX_SRC
+  app/gfx/bitmap.cc
+  app/gfx/pseudo_vram.cc
+  app/gfx/snes_palette.cc
+  app/gfx/snes_tile.cc
+)
+
+set(
+  YAZE_APP_ZELDA3_SRC
+  app/zelda3/overworld_map.cc
+  app/zelda3/overworld.cc
+  app/zelda3/screen.cc
+)
 
-# Executable Linkage --------------------------------------------------------------------------------------
 add_executable(
     yaze
     yaze.cc
-    app/core/common.cc
-    app/core/controller.cc
-    app/editor/assembly_editor.cc
-    app/editor/dungeon_editor.cc
-    app/editor/master_editor.cc
-    app/editor/overworld_editor.cc
-    app/editor/palette_editor.cc
-    app/editor/screen_editor.cc
-    app/gfx/bitmap.cc
-    app/gfx/pseudo_vram.cc
-    app/gfx/snes_palette.cc
-    app/gfx/snes_tile.cc
-    app/zelda3/overworld_map.cc
-    app/zelda3/overworld.cc
-    app/zelda3/screen.cc
+    ${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
@@ -96,6 +124,7 @@ target_link_libraries(
   ${PNG_LIBRARIES}
   ${GLEW_LIBRARIES}
   ${OPENGL_LIBRARIES} 
+  asar-static
   ImGui
 )
 
diff --git a/src/lib/asar b/src/lib/asar
new file mode 160000
index 00000000..634d6baf
--- /dev/null
+++ b/src/lib/asar
@@ -0,0 +1 @@
+Subproject commit 634d6baf7ad073ef01055c9f0ce923636738d2a7