Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • alchemy/viewer
  • Miezhiko/alchemy-next
  • JennaHuntsman/xdg-integration
  • logue/alchemy-next
  • FelixWolf/alchemy-viewer
  • XenHat/xdg-integration
6 results
Show changes
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
autobuild.xml
View file @ b3efcb8b
......@@ -478,11 +478,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a25b20e9068942afa41f2162baee5d6f8ed9a32710056fb8a40f2342ec6633635296bf56eef86f0034819b79881bf54f</string>
<string>a6690816671a7523908be405de357361fc4053b49542e43481b6a82f543bf62145368fb3c75c6456d647c491779715db</string>
<key>hash_algorithm</key>
<string>sha3_384</string>
<key>url</key>
<string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-881/0.0.881/dullahan-1.9.0_90.6.6_g3c44b04_chromium-90.0.4430.93-darwin64-881.tar.xz</string>
<string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-907/0.0.907/dullahan-1.9.0_90.6.6_g3c44b04_chromium-90.0.4430.93-darwin64-907.tar.xz</string>
</map>
<key>name</key>
<string>darwin64</string>
......@@ -492,11 +492,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>40e33dd62320b8aada53e50ebde555e2387c187a20e694953a934535aebf7f17d5473bf87d59b32e59ee478a44ac431a</string>
<string>e16ae67382b1ab84521238360945cd8ad580cd86cefb9d0908fbac08f040b8ecab5502d80b94de1d05c8195ce1b3d8de</string>
<key>hash_algorithm</key>
<string>sha3_384</string>
<key>url</key>
<string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-881/0.0.881/dullahan-1.9.0_90.6.6_g3c44b04_chromium-90.0.4430.93-linux64-881.tar.xz</string>
<string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-907/0.0.907/dullahan-1.9.0_90.6.6_g3c44b04_chromium-90.0.4430.93-linux64-907.tar.xz</string>
</map>
<key>name</key>
<string>linux64</string>
......@@ -520,11 +520,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>086de01c120591565c48adf2fe2923da39c0fe292c871da786d6f35c6af40200c59ec0f730c24d46a142aeaf2e78fcd4</string>
<string>5f7bf634dddf61aa6133af9c401e51cba13518ff04332534e182c4a0644efaeaeaaf91773e53a2de768b7c2bef40443e</string>
<key>hash_algorithm</key>
<string>sha3_384</string>
<key>url</key>
<string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-881/0.0.881/dullahan-1.9.0_90.6.6_g3c44b04_chromium-90.0.4430.93-windows64-881.tar.xz</string>
<string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-907/0.0.907/dullahan-1.9.0_90.6.6_g3c44b04_chromium-90.0.4430.93-windows64-907.tar.xz</string>
</map>
<key>name</key>
<string>windows64</string>
......
indra/cmake/00-Common.cmake
View file @ b3efcb8b
......@@ -206,7 +206,7 @@ endif (WINDOWS)
if (LINUX)
set(CMAKE_SKIP_RPATH TRUE)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
set(ALCHEMY_GLOBAL_DEFS "-DLL_LINUX=1 -DAPPID=secondlife -DLL_IGNORE_SIGCHLD -D_REENTRANT -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES")
set(ALCHEMY_GLOBAL_CFLAGS "-fvisibility=hidden -fexceptions -fno-math-errno -fno-strict-aliasing -fsigned-char -g -pthread -msse4.2 -mfpmath=sse")
......
indra/llplugin/slplugin/CMakeLists.txt
View file @ b3efcb8b
......@@ -50,20 +50,6 @@ add_executable(SLPlugin
${SLPlugin_SOURCE_FILES}
)
if (WINDOWS)
set_target_properties(SLPlugin
PROPERTIES
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMTD\""
)
elseif (DARWIN)
set_target_properties(SLPlugin
PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_RPATH "@executable_path/../../../../Frameworks;@executable_path/../Frameworks;@executable_path/../Frameworks/plugins"
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
)
endif ()
target_link_libraries(SLPlugin
${LEGACY_STDIO_LIBS}
${LLPLUGIN_LIBRARIES}
......@@ -72,7 +58,25 @@ target_link_libraries(SLPlugin
${PLUGIN_API_WINDOWS_LIBRARIES}
)
if (DARWIN)
if (WINDOWS)
set_target_properties(SLPlugin
PROPERTIES
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMTD\""
)
elseif (LINUX)
set_target_properties(SLPlugin
PROPERTIES
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH TRUE
INSTALL_RPATH "$ORIGIN/../lib;$ORIGIN/llplugin")
elseif (DARWIN)
set_target_properties(SLPlugin
PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_RPATH "@executable_path/../../../../Frameworks;@executable_path/../Frameworks;@executable_path/../Frameworks/plugins"
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
)
# Mac version needs to link against Cocoa
target_link_libraries(SLPlugin ${COCOA_LIBRARY})
# Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
......@@ -83,4 +87,4 @@ if (DARWIN)
-p
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources
)
endif (DARWIN)
endif ()
indra/newview/llviewermedia.cpp
View file @ b3efcb8b
......@@ -1742,8 +1742,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
std::string subprocess_folder = gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter();
media_source->setCEFProgramDirs(subprocess_folder);
#elif LL_LINUX
std::string subprocess_folder = gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() + "llplugin" + gDirUtilp->getDirDelimiter();
media_source->setCEFProgramDirs(subprocess_folder);
std::string subprocess_folder = gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter();
media_source->setCEFProgramDirs("", "", subprocess_folder + "locales");
#endif
media_source->setUserDataPath(user_data_path_cache, gDirUtilp->getUserName(), user_data_path_cef_log, gSavedSettings.getBOOL("CefVerboseLog"));
......
indra/newview/viewer_manifest.py
View file @ b3efcb8b
......@@ -1218,19 +1218,10 @@ def construct(self):
self.path2basename("libvlc", "libmedia_plugin_libvlc.so")
self.path2basename("cef", "libmedia_plugin_cef.so")
# with self.prefix(src=os.path.join(pkgdir, 'lib', 'vlc', 'plugins'), dst="bin/llplugin/vlc/plugins"):
# self.path( "plugins.dat" )
# self.path( "*/*.so" )
# with self.prefix(src=os.path.join(pkgdir, 'lib' ), dst="lib"):
# self.path( "libvlc*.so*" )
# CEF files
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst='bin'):
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst=os.path.join('bin', 'llplugin')):
self.path("chrome-sandbox")
self.path("dullahan_host")
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst=os.path.join('bin', 'llplugin')):
self.path("snapshot_blob.bin")
self.path("v8_context_snapshot.bin")
......@@ -1249,7 +1240,7 @@ def construct(self):
self.path("libEGL.so")
self.path("libGLESv2.so")
with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')):
with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'llplugin', 'locales')):
self.path("*.pak")
self.path("featuretable_linux.txt")
......@@ -1297,7 +1288,7 @@ def strip_binaries(self):
self.run_command(
["find"] +
[os.path.join(self.get_dst_prefix(), dir) for dir in ('bin', 'lib')] +
['-type', 'f', '!', '-name', '*.py',
['-type', 'f', '!', '-name', '*.py', '!', '-name', '*.pak', '!', '-name', '*.bin',
'!', '-name', 'update_install', '-exec', 'strip', '-S', '{}', ';'])
class Linux_i686_Manifest(LinuxManifest):
......