1
0
mirror of synced 2025-01-18 00:56:49 +01:00

Reenabled mac CI and trying to debug the capstone issue

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

View File

@ -129,29 +129,29 @@ jobs:
path: |
build/*.msi
# macos-build:
# runs-on: macos-11.0
# name: 🍎 macOS 11.0
# steps:
macos-build:
runs-on: macos-11.0
name: 🍎 macOS 11.0
steps:
# - name: 🧰 Checkout
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
- name: 🧰 Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
# - name: ⬇️ Install dependencies
# run: |
# brew bundle --no-lock --file dist/Brewfile
- name: ⬇️ Install dependencies
run: |
brew bundle --no-lock --file dist/Brewfile
# - name: ✋ Build
# run: |
# mkdir 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 ..
# make -j 4 package
- name: ✋ Build
run: |
mkdir 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 ..
make -j 4 package
# - name: 📦 Upload DMG
# uses: actions/upload-artifact@v2
# with:
# name: macOS DMG
# path: build/*.dmg
- name: 📦 Upload DMG
uses: actions/upload-artifact@v2
with:
name: macOS DMG
path: build/*.dmg

View File

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