Merge pull request #20 from FrozenAlex/master

Fix qpm build, update to bshook 4.0.1

Author: sc2ad

.github/workflows/build-ndk.yml

@@ -73,7 +73,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: debug_${{ steps.libname.outputs.NAME }}
-          path: ./build/debug_${{ steps.libname.outputs.NAME }}
+          path: ./build/debug/${{ steps.libname.outputs.NAME }}
           if-no-files-found: error
 
       - name: Upload qmod artifact

.github/workflows/publish.yml

@@ -83,7 +83,7 @@ jobs:
           tag_name: ${{ github.event.inputs.version }}
           files: |
             ./build/${{ steps.libname.outputs.NAME }}
-            ./build/debug_${{ steps.libname.outputs.NAME }}
+            ./build/debug/${{ steps.libname.outputs.NAME }}
             ./${{ env.qmodName }}.qmod
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -67,7 +67,12 @@ add_custom_command(TARGET ${COMPILE_ID} POST_BUILD
             COMMENT "Strip debug symbols done on final binary.")
 
 add_custom_command(TARGET ${COMPILE_ID} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E rename lib${COMPILE_ID}.so debug_lib${COMPILE_ID}.so
+            COMMAND ${CMAKE_COMMAND} -E make_directory debug
+            COMMENT "Make directory for debug symbols"
+            )
+
+add_custom_command(TARGET ${COMPILE_ID} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E rename lib${COMPILE_ID}.so debug/lib${COMPILE_ID}.so
             COMMENT "Rename the lib to debug_ since it has debug symbols"
             )
 

qpm.json

@@ -8,8 +8,7 @@
     "url": "https://github.com/sc2ad/Il2CppQuestTypePatching",
     "additionalData": {
       "overrideSoName": "libcustom-types.so",
-      "soLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.1.0/libtypepatching.so",
-      "debugSoLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.1.0/libtypepatching_debug.so"
+      "cmake": true
     }
   },
   "dependencies": [

qpm.shared.json

@@ -8,9 +8,15 @@
       "version": "0.4.6",
       "url": "https://github.com/sc2ad/Il2CppQuestTypePatching",
       "additionalData": {
-        "soLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.1.0/libtypepatching.so",
-        "debugSoLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.1.0/libtypepatching_debug.so",
-        "overrideSoName": "libcustom-types.so"
+        "overrideSoName": "libcustom-types.so",
+        "cmake": true
+      }
+    },
+    "workspace": {
+      "scripts": {
+        "build": [
+          "pwsh ./build.ps1"
+        ]
       }
     },
     "dependencies": [
@@ -30,14 +36,7 @@
           "private": true
         }
       }
-    ],
-    "workspace": {
-      "scripts": {
-        "build": [
-          "pwsh ./build.ps1"
-        ]
-      }
-    }
+    ]
   },
   "restoredDependencies": [
     {
@@ -53,14 +52,14 @@
     {
       "dependency": {
         "id": "beatsaber-hook",
-        "versionRange": "=4.0.0",
+        "versionRange": "=4.0.1",
         "additionalData": {
-          "soLink": "https://github.com/sc2ad/beatsaber-hook/releases/download/v4.0.0/libbeatsaber-hook_4_0_0.so",
-          "debugSoLink": "https://github.com/sc2ad/beatsaber-hook/releases/download/v4.0.0/debug_libbeatsaber-hook_4_0_0.so",
-          "branchName": "version/v4_0_0"
+          "soLink": "https://github.com/sc2ad/beatsaber-hook/releases/download/v4.0.1/libbeatsaber-hook_4_0_1.so",
+          "debugSoLink": "https://github.com/sc2ad/beatsaber-hook/releases/download/v4.0.1/debug_libbeatsaber-hook_4_0_1.so",
+          "branchName": "version/v4_0_1"
         }
       },
-      "version": "4.0.0"
+      "version": "4.0.1"
     },
     {
       "dependency": {