1
0
mirror of synced 2025-02-17 10:58:34 +01:00

build: Completely get rid of system capstone

This commit is contained in:
WerWolv 2021-12-16 12:37:22 +01:00
parent 6b22464771
commit b17808c6c7
13 changed files with 5 additions and 22 deletions

View File

@ -131,7 +131,6 @@ jobs:
cmake:p
make:p
ccache:p
capstone:p
glfw:p
file:p
mbedtls:p

1
.idea/vcs.xml generated
View File

@ -2,6 +2,7 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/external/capstone" vcs="Git" />
<mapping directory="$PROJECT_DIR$/external/curl" vcs="Git" />
<mapping directory="$PROJECT_DIR$/external/fmt" vcs="Git" />
<mapping directory="$PROJECT_DIR$/external/nativefiledialog" vcs="Git" />

1
dist/Brewfile vendored
View File

@ -1,6 +1,5 @@
brew "glfw3"
brew "mbedtls"
brew "capstone"
brew "nlohmann-json"
brew "cmake"
brew "ccache"

1
dist/Dockerfile vendored
View File

@ -13,7 +13,6 @@ RUN pacman -S --needed --noconfirm \
glfw-x11 \
file \
mbedtls \
capstone \
python3 \
freetype2 \
gtk3

View File

@ -26,7 +26,6 @@ RDEPEND="${DEPEND}
media-libs/glfw
sys-apps/file
dev-libs/mbedtls
dev-libs/capstone
dev-cpp/nlohmann_json
x11-libs/gtk+
"

View File

@ -6,7 +6,6 @@ pacman -S --needed \
glfw \
file \
mbedtls \
capstone \
python3 \
freetype2 \
gtk3

View File

@ -22,7 +22,6 @@ apt install -y \
libglm-dev \
libmagic-dev \
libmbedtls-dev \
libcapstone-dev \
python3-dev \
libfreetype-dev \
libgtk-3-dev \

View File

@ -3,7 +3,6 @@
dnf install \
cmake \
gcc-c++ \
capstone-devel \
file-devel \
glfw-devel \
mesa-libGL-devel \

View File

@ -5,7 +5,6 @@ pacman -S --needed --noconfirm \
mingw-w64-x86_64-cmake \
mingw-w64-x86_64-make \
mingw-w64-x86_64-ccache \
mingw-w64-x86_64-capstone \
mingw-w64-x86_64-glfw \
mingw-w64-x86_64-file \
mingw-w64-x86_64-mbedtls \

1
dist/msys2/PKGBUILD vendored
View File

@ -12,7 +12,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-make"
"${MINGW_PACKAGE_PREFIX}-dlfcn"
"${MINGW_PACKAGE_PREFIX}-capstone"
"${MINGW_PACKAGE_PREFIX}-glfw"
"${MINGW_PACKAGE_PREFIX}-file"
"${MINGW_PACKAGE_PREFIX}-mbedtls"

View File

@ -12,16 +12,6 @@ finish-args:
- --device=all
modules:
- name: capstone
buildsystem: cmake-ninja
builddir: true
config-opts:
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
sources:
- type: archive
url: https://github.com/aquynh/capstone/archive/4.0.2.tar.gz
sha256: 7c81d798022f81e7507f1a60d6817f63aa76e489aa4e7055255f21a22f5e526a
- name: libiconv
sources:
- type: archive
@ -64,7 +54,7 @@ modules:
sha256: 4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b
- name: imhex
buildsystem: cmake-ninja
buildsystem: cmake
sources:
- type: git

View File

@ -54,7 +54,7 @@ add_library(${PROJECT_NAME} SHARED
target_include_directories(${PROJECT_NAME} PRIVATE include)
# Add additional libraries here #
target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle capstone)
target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle)
# ---- No need to change anything from here downwards unless you know what you're doing ---- #

View File

@ -60,7 +60,8 @@ if (NOT USE_SYSTEM_CAPSTONE)
set(CAPSTONE_BUILD_SHARED OFF)
set(CAPSTONE_BUILD_TESTS OFF)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/capstone ${CMAKE_CURRENT_BINARY_DIR}/external/capstone EXCLUDE_FROM_ALL)
set(CAPSTONE_LIBRARIES capstone-static)
set(CAPSTONE_LIBRARIES "capstone-static")
set(CAPSTONE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../external/capstone/include/capstone)
else()
find_package(PkgConfig REQUIRED)
pkg_search_module(CAPSTONE 4.0.2 REQUIRED capstone)