Age | Commit message (Collapse) | Author |
|
but set CMAKE_INSTALL_PREFIX to newview/Megapahit.app/Contents.
|
|
Adding custom command to fix SLPlugin's references wouldn't have
any effect because fixup_bundle will overwrite them in install stage.
|
|
Turns out the custom command was only for bundling it, not
necessarily installing it.
|
|
Except for SLPlugin since there's already a custom command for it.
|
|
source for viewer 7.1.8.9375512768
|
|
So we don't need to have a custom environment -DLL_FREEBSD=1 setting.
|
|
source for viewer 7.1.7.8974243247
|
|
|
|
|
|
LF, and trim trailing whitespaces as needed
|
|
source for viewer 7.1.6.8745209917
|
|
|
|
DRTVWR-583
|
|
The lllibs need to be built as static libs now, otherwise SLPlugin
would lose reference to gSavedSettings. The media plugins still need to
be built as dynamic libs however, so they can't rely on the condition in
LibraryInstall.cmake any more.
Since the Megapahit viewer, when built using GCC, is using the default
value for _GLIBCXX_USE_CXX11_ABI (which is 1 for the newer C++11 ABI as
opposed to 0 for the older C++03 ABI), the Dullahan dependency needs to
be built with the very same _GLIBCXX_USE_CXX11_ABI setting too, otherwise
apr_dso would fail at loading libmedia_plugin_cef.so because of the failure
to refer to the setOnConsoleMessageCallback function with strictly the same
(not differing between std::__cxx11::basic_string vs. std::basic_string)
parameter types.
The CEF build is Spotify's, so no live streaming support, while the
Dullahan package used by the viewer was built using Kokua's dullahan
fork. After rebuilding it with _GLIBCXX_USE_CXX11_ABI kept at default
by not overriding it in variables (from the build-variables repo), the
order of the target link libraries in CEFPlugin.cmake doesn't seem to
matter any more (it did before!).
Now EXTERNAL_TOS can be safely omitted from GNU/Linux added compile
definitions (but still used on FreeBSD).
|
|
|
|
source for viewer 7.1.1.7039128750
|
|
Just untar Dullahan package manually in prebuilt libs dir.
|
|
See 7dd1149e3649057f0962b85bdc467f4e9299b235.
The attributes only needed to be moved from LLWindowMacOS X to LLWindowSDL.
|
|
|
|
Since we could use the dynamic versioning from the configuration phase
of CMake, the inclusion is put in BuildVersion.cmake.
Other CPACK variables are usually static so can be set when running
cmake.
CPack somehow doesn't pick up the DESTINATION values in ViewerInstall
(slplugin & libvlc too) from UnixInstall, so they're they're partially
hardcoded again there.
|
|
HiDPI support & multi threaded OpenGL haven't been used since we
switched to SDL2 on Darwin, and so far there hasn't been any sign
that things aren't working any more significantly.
|
|
|
|
so SLPlugin wouldn't lose reference to it when the libraries are built
as dynamic.
|
|
Useful when installed as shared libraries, so other viewer executables
can share these libraries.
|
|
by removing cyclic dependencies, and allowing shlib undefined on
SLPlugin alone.
|
|
replacement NSEventMaskAny. Functionality unaltered.
|
|
|
|
DRTVWR-583
|
|
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
|
|
Looks like pollTick tried to call an already dead process
|
|
DRTVWR-568_cmake
|
|
|
|
dependent_it in llfloater was not valid after dependent floater removed itself from the list
|
|
DRTVWR-543-maint_cmake
|
|
|
|
sets the property on those.
|
|
|
|
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
|
|
variables.
|
|
LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
|
|
compiled on.
This gets rid of the a few OS specific set and uses variables (which some even seemed mostly
duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of
having them to tack on every target, as of no they come as a transitive dependency from llcommon
|
|
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
|
|
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
|
|
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
|
# Conflicts:
# README.md
|
|
# Conflicts:
# doc/contributions.txt
|