diff --git a/assets/asar.dll b/assets/asar.dll new file mode 100644 index 00000000..49d7003f Binary files /dev/null and b/assets/asar.dll differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 146ae399..85fdf01d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,12 +36,6 @@ set( # Asar Assembly --------------------------------------------------------------- add_subdirectory(lib/asar/src) -get_target_property(ASAR_INCLUDE_DIR asar-static INCLUDE_DIRECTORIES) -include_directories(${ASAR_INCLUDE_DIR}) -set(ASAR_GEN_EXE_TEST OFF) -set(ASAR_GEN_DLL_TEST OFF) -set(ASAR_GEN_EXE OFF) -add_definitions(-Dstricmp=strcasecmp) # yaze source files ----------------------------------------------------------- set( @@ -99,6 +93,7 @@ add_executable( ${YAZE_APP_ZELDA3_SRC} ${YAZE_GUI_SRC} ${IMGUI_SRC} + lib/asar/src/asar-dll-bindings/c/asardll.c ) target_include_directories( @@ -110,6 +105,7 @@ target_include_directories( ${PNG_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR} ${GLEW_INCLUDE_DIRS} + lib/asar/src/asar-dll-bindings/c ) set( @@ -142,7 +138,6 @@ target_link_libraries( ${PNG_LIBRARIES} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} - asar-static ImGui ) diff --git a/src/app/asm/script.cc b/src/app/asm/script.cc index b5d6b76d..c55b1935 100644 --- a/src/app/asm/script.cc +++ b/src/app/asm/script.cc @@ -1,6 +1,6 @@ #include "script.h" -#include +#include #include #include diff --git a/src/app/asm/script.h b/src/app/asm/script.h index 435c2293..af6a9836 100644 --- a/src/app/asm/script.h +++ b/src/app/asm/script.h @@ -1,7 +1,7 @@ #ifndef YAZE_APP_ASM_SCRIPT_H #define YAZE_APP_ASM_SCRIPT_H -#include +#include #include #include @@ -23,7 +23,7 @@ constexpr char kDefaultMosaicHook[] = "$02AADB"; class Script { public: - Script() = default; + Script() { asar_init_with_dll_path("C:/Users/starw/Code/yaze/assets/asar.dll"); } absl::Status ApplyPatchToROM(ROM& rom);