scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove asar while features experimental

Browse Source
This commit is contained in:
Justin Scofield
2022-12-30 20:22:08 -06:00
parent fbb320e772
commit 2dae505587
5 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -20,6 +20,8 @@ set(BUILD_SHARED_LIBS ON)
# Abseil Standard Specifications ---------------------------------------------- # Abseil Standard Specifications ----------------------------------------------
include(cmake/absl.cmake) include(cmake/absl.cmake)
add_subdirectory(src/lib/abseil-cpp)
include(cmake/openssl.cmake) include(cmake/openssl.cmake)
set(PROTOBUF_INCLUDE_PATH ${CMAKE_CURRENT_BINARY_DIR} 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(PNG REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
# find_package(gRPC REQUIRED) find_package(SDL2)
# Asar Assembly --------------------------------------------------------------- # Asar Assembly ---------------------------------------------------------------
add_subdirectory(src/lib/asar/src) # add_subdirectory(src/lib/asar/src)
include(cmake/asar.cmake) # include(cmake/asar.cmake)
include(cmake/imgui.cmake) include(cmake/imgui.cmake)
# Project Files # Project Files
add_subdirectory(src/lib/abseil-cpp)
add_subdirectory(src/lib/SDL)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(test) add_subdirectory(test)

8
src/CMakeLists.txt
View File

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

12
src/app/asm/script.cc
View File

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

2
src/app/asm/script.h
View File

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

6
test/CMakeLists.txt
View File

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