Primer depuración. Limpieza archivos innecesarios, cambios de nombres y preparación para Puma.

This commit is contained in:
2025-05-25 22:25:31 -03:00
parent d883ddd0d0
commit a5d5fe6288
37 changed files with 287 additions and 163 deletions
+9 -10
View File
@@ -26,7 +26,6 @@ include(LLCA)
include(LLCommon)
include(LLCoreHttp)
include(LLImage)
include(LLKDU)
include(LLPhysicsExtensions)
include(LLPrimitive)
include(LLWindow)
@@ -1740,11 +1739,11 @@ LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
# <FS:TS> Generate the version information header file.
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/pmversionvalues.h.in
${CMAKE_CURRENT_BINARY_DIR}/pmversionvalues.h
${CMAKE_CURRENT_SOURCE_DIR}/fsversionvalues.h.in
${CMAKE_CURRENT_BINARY_DIR}/fsversionvalues.h
@ONLY
)
list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/pmversionvalues.h)
list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/fsversionvalues.h)
# </FS:TS>
source_group("CMake Rules" FILES ViewerInstall.cmake)
@@ -2147,11 +2146,11 @@ set_source_files_properties(${viewer_FONT_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND viewer_SOURCE_FILES ${viewer_FONT_FILES})
file(GLOB viewer_FS_RESOURCES pm_resources/*)
source_group("puma Resources" FILES ${viewer_FS_RESOURCES})
set_source_files_properties(${viewer_FS_RESOURCES}
file(GLOB viewer_PM_RESOURCES pm_resources/*)
source_group("Puma Resources" FILES ${viewer_PM_RESOURCES})
set_source_files_properties(${viewer_PM_RESOURCES}
PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND viewer_SOURCE_FILES ${viewer_FS_RESOURCES})
list(APPEND viewer_SOURCE_FILES ${viewer_PM_RESOURCES})
file(GLOB viewer_PY_SCRIPTS *.py)
source_group("Python Scripts" FILES ${viewer_PY_SCRIPTS})
@@ -2578,7 +2577,7 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
# </FS:Ansariel>
if (LINUX)
set(product puma-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
set(product Puma-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
# These are the generated targets that are copied to package/
set(COPY_INPUT_DEPENDENCIES
@@ -2868,7 +2867,7 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
endif (LINUX)
endif (USE_BUGSPLAT)
if (DARWIN) #Linux/Windows generates symbols via viewer_manifest.py/fs_viewer_manifest.py
if (DARWIN) #Linux/Windows generates symbols via viewer_manifest.py/pm_viewer_manifest.py
# for both Bugsplat and Breakpad
add_dependencies(llpackage generate_symbols)
endif()