Eliminado el soporte de discord.
Corrección de nombres y typos. Eliminación de código innecesario. Depuración archivos de idiomas.
This commit is contained in:
@@ -50,7 +50,6 @@ include(LLPrimitive)
|
||||
include(Growl)
|
||||
include(ColladaDom)
|
||||
include(jemalloc)
|
||||
include(Discord)
|
||||
|
||||
# <FS:ND> if using ndPhysicsstub this variable will be unset, we don't need to build any stub code viewer side in that case
|
||||
if( LLPHYSICSEXTENSIONS_SRC_DIR )
|
||||
@@ -1709,7 +1708,7 @@ if (USE_BUGSPLAT)
|
||||
)
|
||||
endif (USE_BUGSPLAT)
|
||||
|
||||
# <FS:Ansariel> Flickr / Discord keys and fsversionvalues headers are generated in here
|
||||
# <FS:Ansariel> Flickr key and pmversionvalues headers are generated in here
|
||||
include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
|
||||
# <exodus>
|
||||
@@ -1722,24 +1721,13 @@ configure_file(
|
||||
list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/exoflickrkeys.h)
|
||||
# </exodus>
|
||||
|
||||
#<FS:LO> Discord rich presence
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/fsdiscordkey.h.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/fsdiscordkey.h
|
||||
@ONLY
|
||||
)
|
||||
list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/fsdiscordkey.h)
|
||||
LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
|
||||
LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
|
||||
#</FS:LO>
|
||||
|
||||
# <FS:TS> Generate the version information header file.
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/fsversionvalues.h.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/fsversionvalues.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/pmversionvalues.h.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/pmversionvalues.h
|
||||
@ONLY
|
||||
)
|
||||
list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/fsversionvalues.h)
|
||||
list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/pmversionvalues.h)
|
||||
# </FS:TS>
|
||||
|
||||
source_group("CMake Rules" FILES ViewerInstall.cmake)
|
||||
@@ -1755,7 +1743,7 @@ set_source_files_properties(
|
||||
# <FS:TS> The next line causes a full rebuild of the entire newview
|
||||
# directory every time the Mercurial revision number changes.
|
||||
# Instead of doing that, we use the configure tool to build
|
||||
# fsversionstrings.h with the right numbers in it.
|
||||
# pmversionstrings.h with the right numbers in it.
|
||||
# COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake
|
||||
)
|
||||
|
||||
@@ -1831,7 +1819,7 @@ if (LINUX)
|
||||
# <FS:TS> The next line causes a full rebuild of the entire newview
|
||||
# directory every time the Mercurial revision number changes.
|
||||
# Instead of doing that, we use the configure tool to build
|
||||
# fsversionstrings.h with the right numbers in it.
|
||||
# pmversionstrings.h with the right numbers in it.
|
||||
# COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}"
|
||||
)
|
||||
# [FS] Growl support
|
||||
@@ -2509,7 +2497,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
|
||||
ll::tracy
|
||||
ll::openxr
|
||||
fs::glod # <FS:Beq/> restore GLOD dependencies
|
||||
fs::discord # <FS:Ansariel> Discord support
|
||||
)
|
||||
|
||||
if( TARGET ll::intel_memops )
|
||||
|
||||
Reference in New Issue
Block a user