#4470 Adjustments and Mac build fixes
parent
8eb2429a16
commit
c267497509
|
|
@ -6,7 +6,9 @@
|
|||
|
||||
include(CMakeCopyIfDifferent)
|
||||
include(Linking)
|
||||
include(Discord)
|
||||
if (USE_DISCORD)
|
||||
include(Discord)
|
||||
endif ()
|
||||
include(OPENAL)
|
||||
|
||||
# When we copy our dependent libraries, we almost always want to copy them to
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
include(Prebuilt)
|
||||
|
||||
include_guard()
|
||||
|
||||
add_library(ll::discord_sdk INTERFACE IMPORTED)
|
||||
target_compile_definitions(ll::discord_sdk INTERFACE LL_DISCORD=1)
|
||||
|
||||
|
|
|
|||
|
|
@ -1022,7 +1022,7 @@ class Darwin_x86_64_Manifest(ViewerManifest):
|
|||
self.path2basename(relpkgdir, libfile)
|
||||
|
||||
# Discord social SDK
|
||||
if self.args['DISCORD'] == 'ON':
|
||||
if self.args['discord'] == 'ON':
|
||||
for libfile in (
|
||||
"libdiscord_partner_sdk.dylib",
|
||||
):
|
||||
|
|
|
|||
Loading…
Reference in New Issue