From ff3650d57abb6901f9c8bdf6bab835f5fb669336 Mon Sep 17 00:00:00 2001
From: secretfoxtail <remmy@megapahit.net>
Date: Sun, 25 Aug 2024 06:54:35 -0600
Subject: red-sdl cursor tweaks
Try to improve visual consistency
---
indra/newview/res-sdl/arrow.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/arrowcop.BMP | Bin 3126 -> 4234 bytes
indra/newview/res-sdl/arrowcopmulti.BMP | Bin 3126 -> 4234 bytes
indra/newview/res-sdl/arrowdrag.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/circleandline.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/hand.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/ibeam.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/llarrow.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/llarrowdrag.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/llarrowdragmulti.BMP | Bin 3126 -> 4234 bytes
indra/newview/res-sdl/llarrowlocked.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/llgrablocked.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/llno.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/llnolocked.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/lltoolgrab.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/lltoolrotate.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/lltoolscale.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/lltooltranslate.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/sizeall.BMP | Bin 630 -> 2186 bytes
indra/newview/res-sdl/sizenesw.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/sizens.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/sizenwse.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/sizewe.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/toolbuy.BMP | Bin 3126 -> 4234 bytes
indra/newview/res-sdl/toolmediaopen.BMP | Bin 3128 -> 4234 bytes
indra/newview/res-sdl/toolopen.BMP | Bin 3126 -> 4234 bytes
indra/newview/res-sdl/toolpause.BMP | Bin 3128 -> 4234 bytes
indra/newview/res-sdl/toolpickobject.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/toolpickobject2.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/toolpickobject3.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/toolplay.BMP | Bin 3128 -> 4234 bytes
indra/newview/res-sdl/toolsit.BMP | Bin 3126 -> 4234 bytes
indra/newview/res-sdl/wait.BMP | Bin 2102 -> 2186 bytes
indra/newview/res-sdl/working.BMP | Bin 2102 -> 2186 bytes
34 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/indra/newview/res-sdl/arrow.BMP b/indra/newview/res-sdl/arrow.BMP
index a8f6da64b5..1b1e1dcf9c 100644
Binary files a/indra/newview/res-sdl/arrow.BMP and b/indra/newview/res-sdl/arrow.BMP differ
diff --git a/indra/newview/res-sdl/arrowcop.BMP b/indra/newview/res-sdl/arrowcop.BMP
index 1a26a0df34..29ae16c6ed 100644
Binary files a/indra/newview/res-sdl/arrowcop.BMP and b/indra/newview/res-sdl/arrowcop.BMP differ
diff --git a/indra/newview/res-sdl/arrowcopmulti.BMP b/indra/newview/res-sdl/arrowcopmulti.BMP
index 48f153cef6..d1c089c266 100644
Binary files a/indra/newview/res-sdl/arrowcopmulti.BMP and b/indra/newview/res-sdl/arrowcopmulti.BMP differ
diff --git a/indra/newview/res-sdl/arrowdrag.BMP b/indra/newview/res-sdl/arrowdrag.BMP
index cd868eec20..2a29183d64 100644
Binary files a/indra/newview/res-sdl/arrowdrag.BMP and b/indra/newview/res-sdl/arrowdrag.BMP differ
diff --git a/indra/newview/res-sdl/circleandline.BMP b/indra/newview/res-sdl/circleandline.BMP
index 284ae8b7d5..dd630db676 100644
Binary files a/indra/newview/res-sdl/circleandline.BMP and b/indra/newview/res-sdl/circleandline.BMP differ
diff --git a/indra/newview/res-sdl/hand.BMP b/indra/newview/res-sdl/hand.BMP
index 2a092fbb7f..ee315cf521 100644
Binary files a/indra/newview/res-sdl/hand.BMP and b/indra/newview/res-sdl/hand.BMP differ
diff --git a/indra/newview/res-sdl/ibeam.BMP b/indra/newview/res-sdl/ibeam.BMP
index 820904a228..80a4576eb3 100644
Binary files a/indra/newview/res-sdl/ibeam.BMP and b/indra/newview/res-sdl/ibeam.BMP differ
diff --git a/indra/newview/res-sdl/llarrow.BMP b/indra/newview/res-sdl/llarrow.BMP
index a8f6da64b5..13d9cd5910 100644
Binary files a/indra/newview/res-sdl/llarrow.BMP and b/indra/newview/res-sdl/llarrow.BMP differ
diff --git a/indra/newview/res-sdl/llarrowdrag.BMP b/indra/newview/res-sdl/llarrowdrag.BMP
index cd868eec20..2a29183d64 100644
Binary files a/indra/newview/res-sdl/llarrowdrag.BMP and b/indra/newview/res-sdl/llarrowdrag.BMP differ
diff --git a/indra/newview/res-sdl/llarrowdragmulti.BMP b/indra/newview/res-sdl/llarrowdragmulti.BMP
index fb528bc92d..265b80622d 100644
Binary files a/indra/newview/res-sdl/llarrowdragmulti.BMP and b/indra/newview/res-sdl/llarrowdragmulti.BMP differ
diff --git a/indra/newview/res-sdl/llarrowlocked.BMP b/indra/newview/res-sdl/llarrowlocked.BMP
index 0aaa441ab1..8a310a71d7 100644
Binary files a/indra/newview/res-sdl/llarrowlocked.BMP and b/indra/newview/res-sdl/llarrowlocked.BMP differ
diff --git a/indra/newview/res-sdl/llgrablocked.BMP b/indra/newview/res-sdl/llgrablocked.BMP
index 847439670f..6c8d40891c 100644
Binary files a/indra/newview/res-sdl/llgrablocked.BMP and b/indra/newview/res-sdl/llgrablocked.BMP differ
diff --git a/indra/newview/res-sdl/llno.BMP b/indra/newview/res-sdl/llno.BMP
index 284ae8b7d5..dd630db676 100644
Binary files a/indra/newview/res-sdl/llno.BMP and b/indra/newview/res-sdl/llno.BMP differ
diff --git a/indra/newview/res-sdl/llnolocked.BMP b/indra/newview/res-sdl/llnolocked.BMP
index 61f0170cb3..40893c9982 100644
Binary files a/indra/newview/res-sdl/llnolocked.BMP and b/indra/newview/res-sdl/llnolocked.BMP differ
diff --git a/indra/newview/res-sdl/lltoolgrab.BMP b/indra/newview/res-sdl/lltoolgrab.BMP
index f2ac68bf3c..91220ec354 100644
Binary files a/indra/newview/res-sdl/lltoolgrab.BMP and b/indra/newview/res-sdl/lltoolgrab.BMP differ
diff --git a/indra/newview/res-sdl/lltoolrotate.BMP b/indra/newview/res-sdl/lltoolrotate.BMP
index dd84673018..6115984c62 100644
Binary files a/indra/newview/res-sdl/lltoolrotate.BMP and b/indra/newview/res-sdl/lltoolrotate.BMP differ
diff --git a/indra/newview/res-sdl/lltoolscale.BMP b/indra/newview/res-sdl/lltoolscale.BMP
index 882515e5e3..7782817d9b 100644
Binary files a/indra/newview/res-sdl/lltoolscale.BMP and b/indra/newview/res-sdl/lltoolscale.BMP differ
diff --git a/indra/newview/res-sdl/lltooltranslate.BMP b/indra/newview/res-sdl/lltooltranslate.BMP
index d084f6a026..4fd761bc9b 100644
Binary files a/indra/newview/res-sdl/lltooltranslate.BMP and b/indra/newview/res-sdl/lltooltranslate.BMP differ
diff --git a/indra/newview/res-sdl/sizeall.BMP b/indra/newview/res-sdl/sizeall.BMP
index 03d9bf4654..70b9549d17 100644
Binary files a/indra/newview/res-sdl/sizeall.BMP and b/indra/newview/res-sdl/sizeall.BMP differ
diff --git a/indra/newview/res-sdl/sizenesw.BMP b/indra/newview/res-sdl/sizenesw.BMP
index 559579f40e..a7f1804dbc 100644
Binary files a/indra/newview/res-sdl/sizenesw.BMP and b/indra/newview/res-sdl/sizenesw.BMP differ
diff --git a/indra/newview/res-sdl/sizens.BMP b/indra/newview/res-sdl/sizens.BMP
index 8373077dff..91473b2ff0 100644
Binary files a/indra/newview/res-sdl/sizens.BMP and b/indra/newview/res-sdl/sizens.BMP differ
diff --git a/indra/newview/res-sdl/sizenwse.BMP b/indra/newview/res-sdl/sizenwse.BMP
index 6d069fa765..6c82a68e2a 100644
Binary files a/indra/newview/res-sdl/sizenwse.BMP and b/indra/newview/res-sdl/sizenwse.BMP differ
diff --git a/indra/newview/res-sdl/sizewe.BMP b/indra/newview/res-sdl/sizewe.BMP
index 878df453a4..cc8c03fe9c 100644
Binary files a/indra/newview/res-sdl/sizewe.BMP and b/indra/newview/res-sdl/sizewe.BMP differ
diff --git a/indra/newview/res-sdl/toolbuy.BMP b/indra/newview/res-sdl/toolbuy.BMP
index 07e9273721..bcc1253053 100644
Binary files a/indra/newview/res-sdl/toolbuy.BMP and b/indra/newview/res-sdl/toolbuy.BMP differ
diff --git a/indra/newview/res-sdl/toolmediaopen.BMP b/indra/newview/res-sdl/toolmediaopen.BMP
index ac4b231994..670f07235e 100644
Binary files a/indra/newview/res-sdl/toolmediaopen.BMP and b/indra/newview/res-sdl/toolmediaopen.BMP differ
diff --git a/indra/newview/res-sdl/toolopen.BMP b/indra/newview/res-sdl/toolopen.BMP
index 5b87979304..ae4908fd35 100644
Binary files a/indra/newview/res-sdl/toolopen.BMP and b/indra/newview/res-sdl/toolopen.BMP differ
diff --git a/indra/newview/res-sdl/toolpause.BMP b/indra/newview/res-sdl/toolpause.BMP
index dd2c6857d2..33e9975b69 100644
Binary files a/indra/newview/res-sdl/toolpause.BMP and b/indra/newview/res-sdl/toolpause.BMP differ
diff --git a/indra/newview/res-sdl/toolpickobject.BMP b/indra/newview/res-sdl/toolpickobject.BMP
index 25469fc3a8..668bc2713c 100644
Binary files a/indra/newview/res-sdl/toolpickobject.BMP and b/indra/newview/res-sdl/toolpickobject.BMP differ
diff --git a/indra/newview/res-sdl/toolpickobject2.BMP b/indra/newview/res-sdl/toolpickobject2.BMP
index 09df69e675..7910837404 100644
Binary files a/indra/newview/res-sdl/toolpickobject2.BMP and b/indra/newview/res-sdl/toolpickobject2.BMP differ
diff --git a/indra/newview/res-sdl/toolpickobject3.BMP b/indra/newview/res-sdl/toolpickobject3.BMP
index fc28698050..324268e76b 100644
Binary files a/indra/newview/res-sdl/toolpickobject3.BMP and b/indra/newview/res-sdl/toolpickobject3.BMP differ
diff --git a/indra/newview/res-sdl/toolplay.BMP b/indra/newview/res-sdl/toolplay.BMP
index 9c40d7dbec..d0e14838e9 100644
Binary files a/indra/newview/res-sdl/toolplay.BMP and b/indra/newview/res-sdl/toolplay.BMP differ
diff --git a/indra/newview/res-sdl/toolsit.BMP b/indra/newview/res-sdl/toolsit.BMP
index 8ce59ae97a..a19bd70f73 100644
Binary files a/indra/newview/res-sdl/toolsit.BMP and b/indra/newview/res-sdl/toolsit.BMP differ
diff --git a/indra/newview/res-sdl/wait.BMP b/indra/newview/res-sdl/wait.BMP
index 26dec59afe..a4f3c5b531 100644
Binary files a/indra/newview/res-sdl/wait.BMP and b/indra/newview/res-sdl/wait.BMP differ
diff --git a/indra/newview/res-sdl/working.BMP b/indra/newview/res-sdl/working.BMP
index 26dec59afe..a4f3c5b531 100644
Binary files a/indra/newview/res-sdl/working.BMP and b/indra/newview/res-sdl/working.BMP differ
--
cgit v1.2.3
From 0ea8609015c74b5571baf8f031e0e26a938372fa Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 25 Aug 2024 21:35:58 +0800
Subject: Put media plugins install commands correspondingly
---
indra/media_plugins/cef/CMakeLists.txt | 44 +++++++++++++++++++++++---
indra/media_plugins/libvlc/CMakeLists.txt | 12 ++++++++
indra/newview/ViewerInstall.cmake | 51 -------------------------------
3 files changed, 52 insertions(+), 55 deletions(-)
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 7f44270fe7..080e37bac8 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -133,10 +133,46 @@ endif (DARWIN)
if (INSTALL)
if (DARWIN)
set(_LIB llplugin)
- elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
- set(_LIB lib/${ARCH}-linux-gnu)
- elseif (EXISTS /lib64)
- set(_LIB lib64)
+ install(
+ DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework"
+ DESTINATION ../Frameworks
+ )
+ install(
+ DIRECTORY
+ "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app"
+ "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app"
+ "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app"
+ "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app"
+ DESTINATION SLPlugin.app/Contents/Frameworks
+ )
+ elseif (LINUX)
+ if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ set(_LIB lib/${ARCH}-linux-gnu)
+ elseif (EXISTS /lib64)
+ set(_LIB lib64)
+ endif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+ install(
+ PROGRAMS
+ ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox
+ ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host
+ DESTINATION libexec/${VIEWER_BINARY_NAME}
+ #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+ install(
+ FILES
+ ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so
+ ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin
+ ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin
+ ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak
+ ${AUTOBUILD_INSTALL_DIR}/resources/chrome_200_percent.pak
+ ${AUTOBUILD_INSTALL_DIR}/resources/icudtl.dat
+ ${AUTOBUILD_INSTALL_DIR}/resources/resources.pak
+ DESTINATION ${_LIB}
+ )
+ install(
+ DIRECTORY ${AUTOBUILD_INSTALL_DIR}/resources/locales
+ DESTINATION ${_LIB}
+ )
else (DARWIN)
set(_LIB lib)
endif (DARWIN)
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 1710d18f4d..893c9ef4f4 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -81,6 +81,18 @@ endif (DARWIN)
if (INSTALL)
if (DARWIN)
set(_LIB llplugin)
+ install(
+ DIRECTORY /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/plugins
+ DESTINATION ${_LIB}
+ )
+ install(
+ FILES
+ /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.5.dylib
+ /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.dylib
+ /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.9.dylib
+ /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib
+ DESTINATION ${_LIB}/plugins
+ )
elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
set(_LIB lib/${ARCH}-linux-gnu)
elseif (EXISTS /lib64)
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 5c4c08dc9d..e6d8f500a0 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -59,32 +59,6 @@ if (DARWIN)
DESTINATION app_settings
)
- install(DIRECTORY
- /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/plugins
- DESTINATION llplugin
- )
-
- install(FILES
- /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.5.dylib
- /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.dylib
- /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.9.dylib
- /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib
- DESTINATION llplugin/plugins
- )
-
- install(DIRECTORY
- "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework"
- DESTINATION ../Frameworks
- )
-
- install(DIRECTORY
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app"
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app"
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app"
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app"
- DESTINATION SLPlugin.app/Contents/Frameworks
- )
-
if (NDOF)
install(FILES
"${AUTOBUILD_INSTALL_DIR}/lib/release/libndofdev.dylib"
@@ -123,9 +97,6 @@ if (LINUX)
else ()
set(_LIB lib)
endif ()
- install(FILES
- ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so
- DESTINATION ${_LIB})
if (USE_FMODSTUDIO)
install(FILES
${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so
@@ -133,28 +104,6 @@ if (LINUX)
${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.23
DESTINATION ${_LIB})
endif (USE_FMODSTUDIO)
- install(PROGRAMS
- ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox
- DESTINATION libexec/${VIEWER_BINARY_NAME}
- #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE
- #GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
- install(PROGRAMS
- ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host
- DESTINATION libexec/${VIEWER_BINARY_NAME})
- install(FILES
- ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin
- ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin
- DESTINATION ${_LIB})
- install(FILES
- ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak
- ${AUTOBUILD_INSTALL_DIR}/resources/chrome_200_percent.pak
- ${AUTOBUILD_INSTALL_DIR}/resources/icudtl.dat
- ${AUTOBUILD_INSTALL_DIR}/resources/resources.pak
- DESTINATION ${_LIB})
- install(DIRECTORY
- ${AUTOBUILD_INSTALL_DIR}/resources/locales
- DESTINATION ${_LIB})
endif (LINUX)
install(DIRECTORY skins app_settings fonts
--
cgit v1.2.3