Skip to content

Commit 52b8a12

Browse files
committed
DiscordCoreAPI Release 2.0.8
* Updated to keep in track with Jsonifier dependency. * Removed the compile-time CPU architecture script.
1 parent 58bb3c3 commit 52b8a12

39 files changed

+1018
-1310
lines changed

.github/workflows/MSVC-Windows-Binaries.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,10 @@ jobs:
4646
cmake --build . --config=${{matrix.build_type}}
4747
4848
- name: Install the Test
49-
working-directory: ./Build/Tests
49+
working-directory: ./Build/
5050
run: |
5151
cmake --install ./ --config=${{matrix.build_type}}
5252
53-
- name: Run the Test
54-
working-directory: ./Tests/Install/${{matrix.build_type}}
55-
run: |
56-
./DiscordCoreAPITest.exe
57-
continue-on-error: true
58-
5953
- name: Clone DiscordCoreAPI-Binaries repository
6054
run: |
6155
git clone https://github.com/RealTimeChris/DiscordCoreAPI-Binaries.git ./DiscordCoreAPI-Binaries
@@ -65,12 +59,14 @@ jobs:
6559
6660
- name: Copy build artifacts to DiscordCoreAPI-Binaries
6761
run: |
68-
cp -r ./Tests/Install/${{matrix.build_type}}/* ./DiscordCoreAPI-Binaries/${{matrix.build_type}}
62+
cp -r -Force "C:/Program Files (x86)/DiscordCoreAPI/*" ./DiscordCoreAPI-Binaries/${{matrix.build_type}} -v
63+
cd ./DiscordCoreAPI-Binaries/${{matrix.build_type}}
64+
Remove-Item -Force ./bin/discordcoreapi.pdb
6965
7066
- name: Commit and push changes to DiscordCoreAPI-Binaries
7167
working-directory: ./DiscordCoreAPI-Binaries
7268
run: |
7369
git add .
7470
git commit -m "Update binaries for ${{matrix.build_type}} build"
75-
git push https://x-access-token:${{ secrets.PAT_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
71+
git push https://x-access-token:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
7672
continue-on-error: true

.github/workflows/MSVC-Windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ jobs:
7272
run: |
7373
git add .
7474
git commit -m "Update binaries for ${{matrix.build_type}} build"
75-
git push https://x-access-token:${{ secrets.PAT_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
75+
git push https://x-access-token:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/RealTimeChris/DiscordCoreAPI-Binaries.git main
7676
continue-on-error: true

CMake/BuildFeatureTester.bat

-2
This file was deleted.

CMake/BuildFeatureTester.sh

-3
This file was deleted.

CMake/CMakeLists.txt

-5
This file was deleted.

CMake/DCADetectArchitecture.cmake

-115
This file was deleted.

CMake/main.cpp

-184
This file was deleted.

CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ set(Opus_DIR "C:/Vcpkg/installed/x64-windows-static/share/opus") # Set this one
2525
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".
2626
set(Jsonifier_DIR "") # Set this one to the folder location of the file "JsonifierConfig.cmake".
2727
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.
28-
set(VCPKG_ROOT_DIR "C:/Vcpkg")
2928
set(CMAKE_BUILD_TYPES "Release;Debug")
3029
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
3130
set(DEV TRUE)
3231

33-
if (EXISTS "${VCPKG_ROOT_DIR}")
32+
if (EXISTS "${_VCPKG_ROOT_DIR}")
33+
set(VCPKG_ROOT_DIR "${_VCPKG_ROOT_DIR}")
34+
set(ENV{VCPKG_INSTALLATION_ROOT} "${_VCPKG_ROOT_DIR}")
35+
else()
36+
set(VCPKG_ROOT_DIR "C:/Vcpkg")
3437
set(ENV{VCPKG_INSTALLATION_ROOT} "${VCPKG_ROOT_DIR}")
3538
endif()
3639

0 commit comments

Comments
 (0)