diff --git a/.gitmodules b/.gitmodules index 111fb6cd..bef1d655 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,6 @@ path = external/keystone url = https://github.com/keystone-engine/keystone branch = master -[submodule "injector"] - path = external/injector - url = https://github.com/rdbo/injector - branch = rdbo-flatpak-sandbox-fix [submodule "vcvars-bash"] path = external/vcvars-bash url = https://github.com/nathan818fr/vcvars-bash.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 05cfd988..c2603fc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,6 @@ set(KEYSTONE_INC "${KEYSTONE_DIR}/include") set(KEYSTONE_IMPORT_DIR "${PROJECT_BINARY_DIR}/external/keystone-engine-prefix/src/keystone-engine-build/llvm/lib") set(LLVM_DIR "${EXTERNAL_DEPENDENCIES_DIR}/llvm") set(LLVM_INC "${LLVM_DIR}/include") -set(INJECTOR_DIR "${EXTERNAL_DEPENDENCIES_DIR}/injector") -set(INJECTOR_INC "${INJECTOR_DIR}/include") add_subdirectory("${EXTERNAL_DEPENDENCIES_DIR}") add_library(capstone STATIC IMPORTED) @@ -117,7 +115,6 @@ include_directories(${PROJECT_SOURCE_DIR} ${CAPSTONE_INC} ${KEYSTONE_INC} ${LLVM_INC} - ${INJECTOR_INC} ) if (LIBMEM_BUILD_TESTS) @@ -161,10 +158,6 @@ else() message(FATAL_ERROR "[!] Unsupported platform") endif() -if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - set(LIBMEM_DEPS ${LIBMEM_DEPS} injector) -endif() - target_link_libraries(libmem ${LIBMEM_DEPS}) if(LIBMEM_BUILD_STATIC) # Create a bundled static library containing all dependencies (to mimic the shared library behavior) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index ba846891..4d36ca9c 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -80,19 +80,3 @@ add_library(keystone STATIC IMPORTED) set_target_properties(keystone PROPERTIES IMPORTED_LOCATION ${KEYSTONE_IMPORT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}keystone${CMAKE_STATIC_LIBRARY_SUFFIX}) add_subdirectory("${LLVM_DIR}") - -if(${CMAKE_SYSTEM_NAME} STREQUAL Windows OR ${CMAKE_SYSTEM_NAME} STREQUAL CYGWIN) - file(GLOB_RECURSE INJECTOR_SRC "${INJECTOR_DIR}/src/windows/*.c") -elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux OR ${CMAKE_SYSTEM_NAME} STREQUAL Android) - file(GLOB_RECURSE INJECTOR_SRC "${INJECTOR_DIR}/src/linux/*.c" "${INJECTOR_DIR}/src/linux/*.S") -endif() - -if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD) - add_library(injector - STATIC - ${INJECTOR_SRC} - ) - set_target_properties(injector PROPERTIES POSITION_INDEPENDENT_CODE True) - target_include_directories(injector PUBLIC "${INJECTOR_INC}") - set(LIBMEM_DEPS ${LIBMEM_DEPS} injector) -endif() diff --git a/external/injector b/external/injector deleted file mode 160000 index cbb76dac..00000000 --- a/external/injector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cbb76daca7a37c7424bfb4835fcc2228f17b0897