From ffbcf0fb33d531362f42bad42e7bbe8e0c941d02 Mon Sep 17 00:00:00 2001 From: Ryan Teal <rynteal93@gmail.com> Date: Tue, 2 Jul 2019 21:00:57 +0100 Subject: [PATCH] Add as include directory --- app/CMakeLists.txt | 2 ++ app/src/main/cpp/core/hos/loaders/nro.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 1ea2ffb6..b0df1626 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -5,12 +5,14 @@ set_property(GLOBAL PROPERTY CMAKE_CXX_STANDARD 17 PROPERTY CMAKE_CXX_STANDARD_R set(source_DIR ${CMAKE_SOURCE_DIR}/src/main/cpp) include_directories(${source_DIR}/include) +include_directories(${source_DIR}) add_library(lightswitch SHARED ${source_DIR}/lightswitch.cpp ${source_DIR}/core/arm/cpu.cpp ${source_DIR}/core/arm/memory.cpp + ${source_DIR}/core/hos/kernel/svc.cpp ${source_DIR}/core/hos/loaders/nro.cpp ) target_link_libraries(lightswitch ${source_DIR}/lib/${ANDROID_ABI}/libunicorn.a) diff --git a/app/src/main/cpp/core/hos/loaders/nro.cpp b/app/src/main/cpp/core/hos/loaders/nro.cpp index bac4005b..6142ea1d 100644 --- a/app/src/main/cpp/core/hos/loaders/nro.cpp +++ b/app/src/main/cpp/core/hos/loaders/nro.cpp @@ -2,8 +2,8 @@ #include <syslog.h> #include <sys/mman.h> #include <vector> -#include "../../arm/cpu.h" -#include "../../arm/memory.h" +#include "core/arm/cpu.h" +#include "core/arm/memory.h" #include "nro.h" void ReadDataFromFile(std::string file, char* output, uint32_t offset, size_t size)