From 362f8acb154bae5cfde02e41637fa57096734622 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Mon, 25 Jan 2021 15:09:30 +0100
Subject: [PATCH] Reenabled mac CI and trying to debug the capstone issue

---
 .github/workflows/build.yml | 44 ++++++++++++++++++-------------------
 CMakeLists.txt              |  4 +++-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20676d4f9..615c27ba3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a2c0320b..d2683eb83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()