Skip to content

Commit

Permalink
removed injector submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
rdbo committed Apr 8, 2024
1 parent 435f7f7 commit 4c289ff
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 28 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -117,7 +115,6 @@ include_directories(${PROJECT_SOURCE_DIR}
${CAPSTONE_INC}
${KEYSTONE_INC}
${LLVM_INC}
${INJECTOR_INC}
)

if (LIBMEM_BUILD_TESTS)
Expand Down Expand Up @@ -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)
Expand Down
16 changes: 0 additions & 16 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 0 additions & 1 deletion external/injector
Submodule injector deleted from cbb76d

0 comments on commit 4c289ff

Please sign in to comment.