Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-29 19:17:28 +01:00
Code Releases Wiki Activity

Reenabled mac CI and trying to debug the capstone issue

Browse Source
This commit is contained in:
WerWolv 2021-01-25 15:09:30 +01:00
parent b58bc685e1
commit 362f8acb15
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.github/workflows/build.yml vendored
View File

@ -129,29 +129,29 @@ jobs:
path: | path: |
build/*.msi build/*.msi
# macos-build: macos-build:
# runs-on: macos-11.0 runs-on: macos-11.0
# name: 🍎 macOS 11.0 name: 🍎 macOS 11.0
# steps: steps:
# - name: 🧰 Checkout - name: 🧰 Checkout
# uses: actions/checkout@v2 uses: actions/checkout@v2
# with: with:
# fetch-depth: 0 fetch-depth: 0
# - name: ⬇️ Install dependencies - name: ⬇️ Install dependencies
# run: | run: |
# brew bundle --no-lock --file dist/Brewfile brew bundle --no-lock --file dist/Brewfile
# - name: ✋ Build - name: ✋ Build
# run: | run: |
# mkdir build mkdir build
# cd build cd build
# CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCREATE_BUNDLE=ON -DCREATE_PACKAGE=ON .. CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCREATE_BUNDLE=ON -DCREATE_PACKAGE=ON ..
# make -j 4 package make -j 4 package
# - name: 📦 Upload DMG - name: 📦 Upload DMG
# uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
# with: with:
# name: macOS DMG name: macOS DMG
# path: build/*.dmg path: build/*.dmg

4
CMakeLists.txt
View File

@ -16,7 +16,7 @@ set(PLUGINS
# List extra magic databases to compile here # List extra magic databases to compile here
set(MAGICDBS set(MAGICDBS
nintendo_magic magic_dbs/nintendo_magic
) )
createMagicDbList() createMagicDbList()
@ -29,6 +29,8 @@ add_subdirectory(plugins/libimhex)
# Add include directories # Add include directories
include_directories(include ${CRYPTO_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}) include_directories(include ${CRYPTO_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS})
message(${CAPSTONE_INCLUDE_DIRS})
detectOS() detectOS()
detectArch() detectArch()