Skip to content

Commit 57693a2

Browse files
committed
DiscordCoreAPI v2.0.9
1 parent a6d1022 commit 57693a2

File tree

19 files changed

+282
-472
lines changed

19 files changed

+282
-472
lines changed

CMake/BuildFeatureTester.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

CMake/BuildFeatureTester.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

CMake/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

CMake/DCADetectArchitecture.cmake

Lines changed: 0 additions & 117 deletions
This file was deleted.

CMake/main.cpp

Lines changed: 0 additions & 184 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,12 @@
2121
# CMakeLists.txt - The CMake script for building this library.
2222
# May 13, 2021
2323
# https://discordcoreapi.com
24-
set(Opus_DIR "C:/Vcpkg/installed/x64-windows-static/share/opus") # Set this one to the folder location of the file "OpusConfig.cmake".
25-
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".
26-
set(Jsonifier_DIR "") # Set this one to the folder location of the file "JsonifierConfig.cmake".
27-
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")
29-
set(CMAKE_BUILD_TYPES "Release;Debug")
30-
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
31-
set(DEV TRUE)
3224

33-
if (EXISTS "${VCPKG_ROOT_DIR}")
25+
if (EXISTS "${_VCPKG_ROOT_DIR}")
26+
set(VCPKG_ROOT_DIR "${_VCPKG_ROOT_DIR}")
27+
set(ENV{VCPKG_INSTALLATION_ROOT} "${_VCPKG_ROOT_DIR}")
28+
else()
29+
set(VCPKG_ROOT_DIR "C:/Vcpkg")
3430
set(ENV{VCPKG_INSTALLATION_ROOT} "${VCPKG_ROOT_DIR}")
3531
endif()
3632

@@ -54,27 +50,6 @@ elseif(UNIX)
5450
set(OS "linux")
5551
endif()
5652
endif()
57-
if (EXISTS "$ENV{VCPKG_INSTALLATION_ROOT}")
58-
set(VCPKG_INSTALLATION_ROOT_NEW "$ENV{VCPKG_INSTALLATION_ROOT}")
59-
if (NOT EXISTS "${OPENSSL_ROOT_DIR}")
60-
set(OPENSSL_ROOT_DIR "${VCPKG_INSTALLATION_ROOT_NEW}/installed/x64-${OS}/")
61-
endif()
62-
if (NOT EXISTS "${OpenSSL_DIR}")
63-
set(OpenSSL_DIR "${VCPKG_INSTALLATION_ROOT_NEW}/installed/x64-${OS}/share/openssl")
64-
endif()
65-
if (NOT EXISTS "${Jsonifier_DIR}")
66-
set(Jsonifier_DIR "${VCPKG_INSTALLATION_ROOT_NEW}/installed/x64-${OS}/share/jsonifier")
67-
endif()
68-
if (NOT EXISTS "${Opus_DIR}")
69-
set(Opus_DIR "${VCPKG_INSTALLATION_ROOT_NEW}/installed/x64-${OS}/share/opus")
70-
endif()
71-
if (NOT EXISTS "${unofficial-sodium_DIR}")
72-
set(unofficial-sodium_DIR "${VCPKG_INSTALLATION_ROOT_NEW}/installed/x64-${OS}/share/unofficial-sodium")
73-
endif()
74-
include("${VCPKG_INSTALLATION_ROOT_NEW}/scripts/buildsystems/vcpkg.cmake")
75-
else()
76-
message(WARNING "No Vcpkg root folder found, Please make sure that you properly set the library folders.")
77-
endif()
7853

7954
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/CMake;")
8055

0 commit comments

Comments
 (0)