Remove unused files, move and organize more

Fernthedev · Nov 15, 2023 · c573814 · c573814
1 parent 9996e53
commit c573814
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 1,983 deletions.
diff --git a/.github/workflows/build-ndk.yml b/.github/workflows/build-ndk.yml
@@ -50,12 +50,9 @@ jobs:
       - name: Build
         run: |
           cd ${GITHUB_WORKSPACE}
-          qpm-rust s build
-          qpm-rust qmod build
-
-      - name: Create Qmod
-        run: |
-          pwsh -Command ./createqmod.ps1 ${{env.qmodName}}
+          qpm s build
+          qpm qmod build
+          qpm s qmod ${{env.qmodName}}
 
       - name: Get Library Name
         id: libname

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -68,10 +68,7 @@ jobs:
           cd ${GITHUB_WORKSPACE}
           qpm s build
           qpm qmod build
-
-      - name: Create Qmod
-        run: |
-          pwsh -Command ./createqmod.ps1 ${{env.qmodName}}
+          qpm s qmod ${{env.qmodName}}
 
       - name: Get Library Name
         id: libname

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # include some defines automatically made by qpm
-include(qpm_defines_fixed.cmake)
+include(./cmake/qpm.cmake)
 
 # override mod id
 set(MOD_ID "paper")
@@ -20,7 +20,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED 20)
 
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-#Output everything to the same folder
+# Output everything to the same folder
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
@@ -55,4 +55,4 @@ if(NOT DEFINED QPM_ANDROID)
 endif()
 
 add_subdirectory(${SOURCE_DIR})
-add_subdirectory(bootstrapper)
+add_subdirectory(src_bootstrapper)
diff --git a/CMakePresets.json b/CMakePresets.json
diff --git a/buildQMOD.ps1 b/buildQMOD.ps1
diff --git a/qpm_defines_fixed.cmake → cmake/qpm.cmake b/qpm_defines_fixed.cmake → cmake/qpm.cmake
diff --git a/qpm.json b/qpm.json
@@ -8,13 +8,19 @@
     "url": "https://github.com/Fernthedev/paperlog",
     "additionalData": {
       "overrideSoName": "libpaperlog.so",
-      "cmake": true
+      "cmake": false
     }
   },
   "workspace": {
     "scripts": {
       "build": [
-        "pwsh ./build.ps1"
+        "pwsh ./scripts/build.ps1"
+      ],
+      "copy": [
+        "pwsh ./scripts/copy.ps1"
+      ],
+      "qmod": [
+        "pwsh ./scripts/createqmod.ps1 $0"
       ]
     }
   },

diff --git a/qpm_defines.cmake b/qpm_defines.cmake