| Age | Commit message (Collapse) | Author |
|---|
|
It's irrelevant on any distro anyway.
|
|
'std::char_traits<unsigned short>' on FreeBSD.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282329
|
|
|
|
I felt like they slowed down the flow.
https://developercommunity.visualstudio.com/t/warnings-in-a-windows-sdk-header-when-compiling-wi/897227
|
|
Parsing failed on macOS' CMake (could be MacPorts, could be the version)
for some reason.
|
|
Bump viewer version for 2025.04.1
|
|
|
|
Avatar Welcome Pack (Updated to target 2025.04.1)
|
|
|
|
cURL is installed on arm64 cause there doesn't seem to be any easy
way to build OpenSSL 1.1 for Windows arm64 (which LL's cURL fork
depends on).
|
|
Crow Misia's libwebrtc-bin, the one we've been relying on for WebRTC
binaries, doesn't seem to be providing Windows arm64 binaries yet.
|
|
(Eventually - marshalled by [GIRD LOWER])
|
|
There's a different section for Windows arm64, cause there are
different patterns in the commands that are too difficult to generalise.
BuildTools is used instead of the full Visual Studio IDE,
and BuildTools is installed in Program Files (x86)
on both Windows x64 and arm64.
The CMake used is the one automatically installed by vcpkg, and it
can find the compilers when the toolchain file setting is set to
the file provided by vcpkg.
This way we don't have to install VS CMake component that depends
on x64/x86 build tools, which we don't need for Windows arm64.
The pkg-config used is the other one downloaded, as the path to it
is common on both Windows arm64 and x64.
cURL is installed on arm64 cause there doesn't seem to be any easy
way to build OpenSSL 1.1 for Windows arm64 (which LL's cURL fork
depends on).
|
|
Referring to cpack-generators(7) manual, I don't know what to replace
the <compName> in CPACK_NSIS_<compName>_INSTALL_DIRECTORY with, but in
CPACK_NSIS_INSTALL_ROOT explanation, it mentions the full directory
presented to the end user, and from that we can conclude the variable we
need to set for customisation is just CPACK_PACKAGE_INSTALL_DIRECTORY.
|
|
https://stackoverflow.com/questions/5801813/c-usleep-is-obsolete-workarounds-for-windows-mingw
|
|
Uncomment a couple of commented out lines out in
indra/llplugin/slplugin.cpp and adjust to something like:
LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG);
LLError::logToFile("C:\\Users\\erik\\AppData\\Roaming\\Megapahit\\logs\\slplugin.log");
I got
"The requested service provider could not be loaded or initialized"
This really helped me solve it:
https://travis-ci.community/t/socket-the-requested-service-provider-could-not-be-loaded-or-initialized/1127
|
|
I started with disabling it for having BUILD_SHARED_LIBS on.
Then I enabled it for macOS when I added internal browser support for
macOS.
Then I enabled it for Linux when I added internal browser support for
Linux.
Then I enabled it for FreeBSD when I added internal browser support
attempt for FreeBSD.
I should have left it enabled by default except for platforms that
surely are not supported to have internal browser.
|
|
|
|
|
|
and minimise diff related to LibVLC headers.
|
|
Move categories dropdown button so that it is not cut off by the edge of the floater, also fix "Arts and Culture" & "Parks and Nature" places categories displaying "MissingString"
|
|
in viewer linking stage on Windows.
throw_exception is user defined (it's not picking up its definition from
anywhere on Windows, at least when using vcpkg's Boost).
(Link target) ->
libcollada14dom23-s.lib(daeURI.obj) : error LNK2019: unresolved external symbol
void __cdecl boost::throw_exception(class std::exception const &)
(?throw_exception@boost@@YAXAEBVexception@std@@@Z) referenced in function
void __cdecl boost::re_detail_500::raise_runtime_error<class boost::regex_error>(class boost::regex_error const &)
(??$raise_runtime_error@Vregex_error@boost@@@re_detail_500@boost@@YAXAEBVregex_error@1@@Z)
[C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
|
|
|
|
Less diffs. And only a couple.
|
|
|
|
center floater anymore because it obscures the avatar.
|
|
Put the necessary files into place.
But, none of them is working just yet.
|
|
This reverts commit f0de1898e0b6a3b9f1ee1bcc762ba334b78bbcc6.
|
|
Turns out the CMAKE_BUILD_TYPE setting is necessary, otherwise it would
be built in RelWithDebInfo configuration.
Reorganise the contributors generation and general CPack settings in
indra/newview/CMakeLists.txt.
Running sed when cross-comping for Linux, on FreeBSD, doesn't need to
use Linux's sed, so no need for ${CMAKE_SYSROOT}/usr/bin prefix, this
way that section can be reused for Windows.
I still couldn't get CPack to make NSIS not use the version numbers as
part of the default installation destination.
Using TARGETS for installing llwebrtc would cause the .lib to be
installed too, which isn't necessary, that's why we use PROGRAMS.
contributors.txt still gets generated wrongly.
The executable icon is still SL's test icon.
ColladaDOM's failure to link to Boost throw_exception, from its use of
Boost Regex, is not fixed yet. I got to this stage by temporarily
removing the offending lines in daeURI.cpp (which are the lines where
Boost Regex is used).
|
|
move it to the center of the screen. Adjust the size of the floater (height) slightly.
|
|
I couldn't get the LL_WARNS to link on Windows yet, so they're just
disabled for now, they're only warnings to the users anyway.
The error was:
llfilesystem.lib(lldiskcache.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(unsigned short const *,unsigned short const *,class std::basic_string<char,struct std::char_traits<char>,cla
ss std::allocator<char> > &,class std::codecvt<unsigned short,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBG0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z) referenced in
function "public: void __cdecl LLDiskCache::clearCache(void)" (?clearCache@LLDiskCache@@QEAAXXZ) [C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
|
|
Basically string() functions call this convert().
The error was:
llfilesystem.lib(lldiriterator.obj) : error LNK2001: unresolved external
symbol "__declspec(dllimport) void __cdecl
boost::filesystem::detail::path_traits::convert(unsigned short const
*,unsigned short const *,class std::basic_string<char,struct
std::char_traits<char>,c
lass std::allocator<char> > &,class std::codecvt<unsigned
short,char,struct _Mbstatet> const *)"
(__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBG0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z)
[C:\Users\er
ik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
Hint on symbols that are defined and could potentially match:
"__declspec(dllimport) void __cdecl
boost::filesystem::detail::path_traits::convert(char const
*,char const *,class std::basic_string<wchar_t,struct
std::char_traits<wchar_t>,class std::allocator<wchar_t> >
&,class std::codecvt<wchar_t,char,struct _Mbstatet> const
*)"
(__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBD0AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z)
"__declspec(dllimport) void __cdecl
boost::filesystem::detail::path_traits::convert(wchar_t
const *,wchar_t const *,class
std::basic_string<char,struct
std::char_traits<char>,class std::allocator<char> >
&,class std::codecvt<wchar_t,char,struct _Mbstatet>
const *)
"
(__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEB_W0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z)
|
|
cause I see the order as per row, going right first, then down left,
then right again, then down left again, and so on.
|
|
The errors were:
llfilesystem.lib(lldiskcache.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(char const *,char const *,class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,cla
ss std::allocator<unsigned short> > &,class std::codecvt<unsigned short,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBD0AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z) refe
renced in function "public: void __cdecl LLDiskCache::purge(void)" (?purge@LLDiskCache@@QEAAXXZ) [C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
Hint on symbols that are defined and could potentially match:
"__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(char const *,char const *,class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > &,class std::codecvt<wchar_t,char,struct _Mbstatet> const
*)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBD0AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z)
"__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(wchar_t const *,wchar_t const *,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > &,class std::codecvt<wchar_t,char,struct _Mbstatet> const *)
" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEB_W0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z)
llfilesystem.lib(lldir.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(unsigned short const *,unsigned short const *,class std::basic_string<char,struct std::char_traits<char>,class std
::allocator<char> > &,class std::codecvt<unsigned short,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBG0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z) referenced in functi
on "public: class std::vector<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class std::allocator<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > > __cdecl LLDir::getFilesInDir(class std:
:basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)" (?getFilesInDir@LLDir@@QEAA?AV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@st
d@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@@Z) [C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
|
|
Correct indendation in list of names and simplify special thanks text
|
|
and make the if, else, & endif styles more consistent.
|
|
Adding another library file to link means adding many more lines
for other platform(s), at least for macOS with its bundling.
It's much simpler to make the condition on 2 files.
|
|
better
|
|
Use monospace font to manually format credits list in 2 columns, also fix annoying indent in licences tab
|
|
on Windows, which might have been because I was still using MinGW back
then.
|
|
|
|
The error was "definition of dllimport static data member not allowed",
and not "definition of dllimport function not allowed" as mentioned in
commit 2bf9d234aac30ed4a85282730da0ffc83acf9adf description.
Basically there were about 5 offending files, and all had
BOOST_JSON_REQUIRE_CONST_INIT in them.
Not including json/src.hpp (that includes them among others), fixes
those errors, but then there are definitions in them that are actually
used by llsdjson.
After doing so many searches, I came across this:
https://stackoverflow.com/questions/3491990/c-definition-of-dllimport-static-data-member
and just from the first paragraph in the accepted answer, I realised
llsdjson can still have those definitions, just not from the offending
headers, but by simply linking to Boost JSON compiled library instead.
|
|
Turns out I couldn't repeat self-building ColladaDOM using SLv prebuilt
Boost successfully, because of the zlib, minizip, libxml2 header
directories search confusion, no matter how I tried tinkering with LL's
ColladaDOM fork CXX_FLAGS and/or EXTRA_COMPILE_FLAGS settings.
With vcpkg Boost, self-building ColladaDOM in the viewer CMake
configuration stage goes smoothly (compiling ColladaDOM on Windows could
take a while, though.. at least on my system).
|
|
This reverts commit 2bf9d234aac30ed4a85282730da0ffc83acf9adf.
|
|
Plus simplifying the SHARED to STATIC stream editing by not using the
global 'g' key, cause it's only 1 instance to edit.
For now, BOOST_CFLAGS & BOOST_LIBS are set to refer to SLv prebuilt
binary installation, along with its library suffix.
try_compile doesn't seem to "compile" it, but it does configure it, so
we just execute MSBuild.exe afterwards.
Last time I tried, it didn't finish building or didn't build
successfully, though.
So what I did is manually run MSBuild.exe on ColladaDOM's solution file,
and the next CMake configuration picked up the generated library,
renamed to be the same as expected when using SLv prebuilt one, so that
we don't have to adjust more lines for this, it has to be copied/moved
anyway, might as well rename it the same.
About the WIN32 definition stream editing, somehow WIN32 is not defined
in daeUtils.cpp, that it would fail at deciding which commands to
compile. I did try adding /DWIN32 to CXX_FLAGS but it ruined it for the
Minizip header directory search. So the hack is to just forcefully
define WIN32 in that file.
|
|
Welcome Pack
|
|
|
|
That's why it was trying to find llwindowsdl.h, through
llappviewerlinux.cpp. I had to scroll up a bit to find out that it was
trying to compile llappviewerlinux.cpp. The last error message only
complained about missing SDL/SDL.h (referred from llwindowsdl.h).
|
|
for now, until we are ready to enable media plugins on Windows.
|
|
Just copying from this site and adjusting it for now:
https://filipivianna.blogspot.com/2010/07/usleep-on-windows-win32.html
|
