DiscordCoreAPI Release 2.0.8

* Updated to keep in track with Jsonifier dependency. * Removed the compile-time CPU architecture script.
RealTimeChris · Nov 27, 2024 · 37a9281 · 37a9281
1 parent 58bb3c3
commit 37a9281
Show file tree

Hide file tree

Showing 40 changed files with 1,026 additions and 1,306 deletions.
diff --git a/.github/workflows/MSVC-Windows-Binaries.yml b/.github/workflows/MSVC-Windows-Binaries.yml
@@ -46,16 +46,10 @@ jobs:
            cmake --build . --config=${{matrix.build_type}}
 
     - name: Install the Test
-      working-directory: ./Build/Tests
+      working-directory: ./Build/
       run: |
            cmake --install ./ --config=${{matrix.build_type}}
 
-    - name: Run the Test
-      working-directory: ./Tests/Install/${{matrix.build_type}}
-      run: |
-            ./DiscordCoreAPITest.exe
-      continue-on-error: true
-
     - name: Clone DiscordCoreAPI-Binaries repository
       run: |
         git clone https://github.com/RealTimeChris/DiscordCoreAPI-Binaries.git ./DiscordCoreAPI-Binaries
@@ -65,12 +59,14 @@ jobs:
 
     - name: Copy build artifacts to DiscordCoreAPI-Binaries
       run: |
-        cp -r ./Tests/Install/${{matrix.build_type}}/* ./DiscordCoreAPI-Binaries/${{matrix.build_type}}
+        cp -r -Force "C:/Program Files (x86)/DiscordCoreAPI/*" ./DiscordCoreAPI-Binaries/${{matrix.build_type}} -v
+        cd ./DiscordCoreAPI-Binaries/${{matrix.build_type}}
+        Remove-Item -Force ./bin/discordcoreapi.pdb
 
     - name: Commit and push changes to DiscordCoreAPI-Binaries
       working-directory: ./DiscordCoreAPI-Binaries
       run: |
         git add .
         git commit -m "Update binaries for ${{matrix.build_type}} build"
-        git push https://x-access-token:${{ secrets.PAT_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
+        git push https://x-access-token:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
       continue-on-error: true
diff --git a/.github/workflows/MSVC-Windows.yml b/.github/workflows/MSVC-Windows.yml
@@ -72,5 +72,5 @@ jobs:
       run: |
         git add .
         git commit -m "Update binaries for ${{matrix.build_type}} build"
-        git push https://x-access-token:${{ secrets.PAT_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
+        git push https://x-access-token:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
       continue-on-error: true
diff --git a/CMake/BuildFeatureTester.bat b/CMake/BuildFeatureTester.bat
diff --git a/CMake/BuildFeatureTester.sh b/CMake/BuildFeatureTester.sh
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
diff --git a/CMake/DCADetectArchitecture.cmake b/CMake/DCADetectArchitecture.cmake
diff --git a/CMake/RCa06928 b/CMake/RCa06928
diff --git a/CMake/main.cpp b/CMake/main.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,12 +25,15 @@ set(Opus_DIR "C:/Vcpkg/installed/x64-windows-static/share/opus") # Set this one
 set(unofficial-sodium_DIR "C:/Vcpkg/installed/x64-windows-static/share/unofficial-sodium") # Set this one to the folder location of the file "unofficial-sodiumConfig.cmake".
 set(Jsonifier_DIR "") # Set this one to the folder location of the file "JsonifierConfig.cmake".
 set(OPENSSL_ROOT_DIR "C:/Vcpkg/installed/x64-windows-static/") # Set this one to the folder location of the include folder and library folders of OpenSSL.
-set(VCPKG_ROOT_DIR "C:/Vcpkg")
 set(CMAKE_BUILD_TYPES "Release;Debug")
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 set(DEV TRUE)
 
-if (EXISTS "${VCPKG_ROOT_DIR}")
+if (EXISTS "${_VCPKG_ROOT_DIR}")
+	set(VCPKG_ROOT_DIR "${_VCPKG_ROOT_DIR}")
+	set(ENV{VCPKG_INSTALLATION_ROOT} "${_VCPKG_ROOT_DIR}")
+else()
+	set(VCPKG_ROOT_DIR "C:/Vcpkg")
 	set(ENV{VCPKG_INSTALLATION_ROOT} "${VCPKG_ROOT_DIR}")
 endif()