Merge branch 'dev' into 'dev'

Add in changes from EA 4176 See merge request suyu-emu/suyu!86
Fix build
2024-03-08 07:49:41 +00:00 · 2024-03-08 07:49:32 +00:00
2 changed files with 4 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -340,6 +340,9 @@ endif()

 if (ENABLE_WEB_SERVICE)
    find_package(cpp-jwt 1.4 CONFIG)
+endif()
+
+if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE)
    find_package(httplib 0.12 MODULE COMPONENTS OpenSSL)
 endif()

--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -119,7 +119,7 @@ endif()
 add_subdirectory(sirit)

 # httplib
-if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)
+if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE AND NOT TARGET httplib::httplib)
    set(HTTPLIB_REQUIRE_OPENSSL ON)
    add_subdirectory(cpp-httplib)
 endif()
Author	SHA1	Message	Date
Daryl Ronningen	9e6bb00142	Merge branch 'dev' into 'dev' Add in changes from EA 4176 See merge request suyu-emu/suyu!86	2024-03-08 07:49:41 +00:00
cass_058	c445fa1e3e	Fix build	2024-03-08 07:49:32 +00:00