Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Use correct include directory for capstone

This commit is contained in:
WerWolv 2022-02-08 19:22:52 +01:00
parent 18169b461a
commit 1738c3f50a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libimhex/CMakeLists.txt
View File

@ -73,7 +73,7 @@ if (NOT USE_SYSTEM_CAPSTONE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/capstone ${CMAKE_CURRENT_BINARY_DIR}/external/capstone EXCLUDE_FROM_ALL) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/capstone ${CMAKE_CURRENT_BINARY_DIR}/external/capstone EXCLUDE_FROM_ALL)
set_target_properties(capstone-static PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(capstone-static PROPERTIES POSITION_INDEPENDENT_CODE ON)
set(CAPSTONE_LIBRARIES "capstone-static") set(CAPSTONE_LIBRARIES "capstone-static")
set(CAPSTONE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../external/capstone/include/capstone) set(CAPSTONE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../external/capstone/include)
else() else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_search_module(CAPSTONE 4.0.2 REQUIRED capstone) pkg_search_module(CAPSTONE 4.0.2 REQUIRED capstone)

10
lib/libimhex/include/hex/helpers/disassembler.hpp
View File

@ -1,15 +1,13 @@
#pragma once #pragma once
#if __has_include(<capstone/capstone.h>)
#include <capstone/capstone.h>
#else
#include <capstone.h>
#endif
#include <hex.hpp> #include <hex.hpp>
#include <capstone/capstone.h>
namespace hex { namespace hex {
enum class Architecture : i32 { enum class Architecture : i32
{
ARM, ARM,
ARM64, ARM64,
MIPS, MIPS,