remove asar while features experimental

CMakeLists.txt

@@ -20,6 +20,8 @@ set(BUILD_SHARED_LIBS ON)
 
 # Abseil Standard Specifications ----------------------------------------------
 include(cmake/absl.cmake)
+add_subdirectory(src/lib/abseil-cpp)
+
 include(cmake/openssl.cmake)
 
 set(PROTOBUF_INCLUDE_PATH ${CMAKE_CURRENT_BINARY_DIR}
@@ -32,16 +34,14 @@ set(Protobuf_INCLUDE_DIRS "/Users/scawful/code/protobuf/include/")
 find_package(PNG REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
-# find_package(gRPC REQUIRED)
+find_package(SDL2)
 
 # Asar Assembly ---------------------------------------------------------------
-add_subdirectory(src/lib/asar/src)
-include(cmake/asar.cmake)
+# add_subdirectory(src/lib/asar/src)
+# include(cmake/asar.cmake)
 
 include(cmake/imgui.cmake)
 
 # Project Files
-add_subdirectory(src/lib/abseil-cpp)
-add_subdirectory(src/lib/SDL)
 add_subdirectory(src)
 add_subdirectory(test)

src/CMakeLists.txt

@@ -59,7 +59,6 @@ add_executable(
   ${YAZE_APP_ZELDA3_SRC}
   ${YAZE_GUI_SRC}
   ${IMGUI_SRC}
-  ${ASAR_STATIC_SRC}
 )
 
 # including libraries ---------------------------------------------------------
@@ -68,12 +67,10 @@ target_include_directories(
   yaze PUBLIC
   lib/
   app/
-  ${ASAR_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/src/
   ${PNG_INCLUDE_DIRS}
   ${SDL2_INCLUDE_DIR}
   ${GLEW_INCLUDE_DIRS}
-  lib/asar/src/
 )
 
 set(SDL_TARGETS SDL2::SDL2)
@@ -94,12 +91,7 @@ target_link_libraries(
   ${OPENGL_LIBRARIES}
   ${CMAKE_DL_LIBS}
   ImGui
-  asar-static
 )
-if (WIN32)
-  # target_compile_definitions(yaze PRIVATE "windows")
-  add_definitions(-DASAR_STATIC)
-endif()
 
 if (UNIX)
   target_compile_definitions(yaze PRIVATE "linux")

src/app/asm/script.cc

@@ -1,6 +1,6 @@
 #include "script.h"
 
-#include <asar/interface-lib.h>
+// #include <asar/interface-lib.h>
 
 #include <array>
 #include <cstdint>
@@ -27,11 +27,11 @@ absl::Status Script::ApplyPatchToROM(ROM &rom) {
   int count = 0;
   auto data = (char *)rom.data();
   int size = rom.size();
-  if (!asar_patch(patch_filename_.c_str(), data, patch_size_, &size)) {
-    auto asar_error = asar_geterrors(&count);
-    auto full_error = asar_error->fullerrdata;
-    return absl::InternalError(absl::StrCat("ASAR Error: ", full_error));
-  }
+  // if (!asar_patch(patch_filename_.c_str(), data, patch_size_, &size)) {
+  //   auto asar_error = asar_geterrors(&count);
+  //   auto full_error = asar_error->fullerrdata;
+  //   return absl::InternalError(absl::StrCat("ASAR Error: ", full_error));
+  // }
   return absl::OkStatus();
 }
 

src/app/asm/script.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_ASM_SCRIPT_H
 #define YAZE_APP_ASM_SCRIPT_H
 
-#include <asar/interface-lib.h>
+// #include <asar/interface-lib.h>
 
 #include <array>
 #include <cstdint>

test/CMakeLists.txt

@@ -24,26 +24,22 @@ add_executable(
   ../src/app/core/common.cc
   ../src/app/delta/service.cc
   ../src/app/delta/client.cc
-  ${ASAR_STATIC_SRC}
 )
 
 target_include_directories(
   yaze_test PUBLIC
   ../src/
   ../src/lib/
-  ../src/lib/asar/src/
-  ${ASAR_INCLUDE_DIR}
   ${SDL_INCLUDE_DIRS}
 )
 
 target_link_libraries(
   yaze_test
-  SDL2::SDL2
+  SDL2
   ${ABSL_TARGETS}
   ${OPENGL_LIBRARIES}
   ${CMAKE_DL_LIBS}
   delta-service
-  asar-static
   gmock_main
   gmock
   gtest_main