| Age | Commit message (Collapse) | Author |
|---|
|
|
|
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
|
|
compile flag.
|
|
|
|
|
|
|
|
and get rid of the error:
'apr_sockaddr_t::sin6' uses undefined struct 'sockaddr_in6'
|
|
I got "definition of dllimport function not allowed" errors when using
vcpkg's Boost.
Someone else got this problem too:
https://github.com/boostorg/serialization/issues/278
Hopefully later we can get back to using vcpkg's Boost.
|
|
otherwise we'd have to deal with every warning.
Instruction for building from the command line too.
Add MSBuild binary directory to PATH, and MSBuild needs its .exe
extension typed too for it to be found, unlike other commands such as
cmake, vcpkg, pkg-config, and so on.
By default, MSBuild builds using the RelWithDebInfo configuration, hence
the -p:Configuration parameter to have Release instead.
I guess that's why CMake would consider CMAKE_BUILD_TYPE as not being
used by the project.
|
|
There doesn't seem to be glext.h on Windows, so we'll just use the
package from LL for now.
|
|
This reverts commit 71d777ea126e7f02cb46c11bdb606094ca06f75c.
|
|
This reverts commit 5ed8df22cd59680a685c4ada7daa5555bf59d4fe.
|
|
This reverts commit 0b62583eb7dd6e193d5daa2e24646bbb9f3c74e5.
We have SDL for opening URLs now.
|
|
This reverts commit fcdef29504a32ad85ce32c3d95ea8648aa169004.
The moment 1 or 2 lines got removed, we lost core profile again.
|
|
Turns out my old GPU is detected as complying only to 4.5 when on Linux.
The fact that it's been detected as complying to 4.6 on FreeBSD this
whole time, is quite ironic.
I've only tested that the viewer runs with 4.6 without this on FreeBSD
(the implication works), will test Linux distros next.
|
|
Update libboost package names.
|
|
and remove the necessity of using sudo to su on FreeBSD,
just like on Gentoo.
|
|
Make DisableLookAtAnimation setting persistent across restarts.
|
|
|
|
|
|
Use original, if somewhat generic landscape screenshot inplace of edited stock screenshot.
|
|
Decrease to 256 to reduce aggressive culling & make user changes to this value persistent across restarts.
|
|
Better match style of default SL_Logo.png
|
|
|
|
|
|
SDL_CaptureMouse
|
