| Age | Commit message (Collapse) | Author |
|---|
|
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
|
|
|
|
|
|
|
|
|
|
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
|
|
DRTVWR-519"
This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing
changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
|
|
|
|
branch. Cloned canonical viewer into DRTVWR-519, copied over the files that changed from DRTVWR-506-simple and pushed back. Once I am satisfied everything is correct, DRTVWR-506-simple will be removed
|
|
|
|
PreferredToolArchitecture=x64 option (required for 32bit TeamCity builds) on 32 bit builds generally - removes a ton of 'unknown option, ignored' spam in the build output
|
|
to avoid TeamCity build failures due to 32-bit compiler running out of virtual
memory for precompiled headers.
|
|
|
|
|
|
|
|
The viewer's 00-COMPILE-LINK-RUN.txt recommends passing -gdwarf-2 to the Mac
compiler, and so we've been doing ever since before the viewer-build-variables
repo was engaged. Now we discover that when CMake sees -gdwarf-2, it removes
the -g switch entirely. It also removes it when you pass plain -g. Only when
you pass -gdwarf-with-dsym or just -gdwarf does CMake pass plain -g to the
compiler. Change -gdwarf-2, if specified, to -gdwarf so we at least get -g.
|
|
|
|
|
|
Going forward, the intention is to set in 00-Common.cmake only switches not
already set for ALL viewer-related libraries in
https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables.
To that end, remove all switches redundant with settings from that file.
Remove redundancies within 00-Common.cmake.
Remove cruft testing for gcc versions older than 4.3.
|
|
In a clang 64-bit compile, with that switch set in CMAKE_CXX_LINK_FLAGS, we
cannot catch any user exception. This shows up right away because TUT relies
on internal exceptions to walk through test<n>() test methods, but of course
being unable to catch any exceptions in the viewer would be just as bad.
A quick Google search turned up lots of people mentioning -no_compact_unwind
without finding any documentation about what it's supposed to be good for. But
since no tests work with it, whereas they work without it -- kill it.
|
|
|
|
There Must Be A Better Way.
|
|
by adding -DADDRESS_SIZE= to the compile switches.
Remove hack to work around limitations of gcc 4.1 build hosts.
Streamline a bit of logic to specify correct -m32 or -m64 switch.
Use ADDRESS_SIZE instead of ARCH to control -march=pentiumpro.
|
|
|
|
|
|
autobuild 1.1 now supports expanding $variables within a config file --
support that was explicitly added to address this very problem. So now the
windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE,
$AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle
most of the deltas between the windows platform and windows64.
This permits removing the windows64 platform definition from autobuild.xml.
The one remaining delta between the windows64 and windows platform definitions
was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking
ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE
instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing
LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
|
|
* Use USER_DEFAULT_SCREEN_DPI define from WinUser.h
* Change Win32 SDK target version to Windows Vista or greater
* Define WM_DPICHANGED as preprocessor definition as in WinUser.h
* Cull manual definitions of WM_MOUSEWHEEL and WHEEL_DELTA which are part of the Win32 SDK since Windows NT 4.0
|
|
(transplanted from 165fa5852652a1da005cf3b2201c192f028efd43)
|
|
enable /arch:SSE2 (x64 implies SSE2 and setting the flag causes warnings).
(transplanted from 5a7cc3874065b13a83b8c7aa044fb07f38edd283)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
zlib cannot be linked with SAFESEH, which is the VS 2013 default, so every
consumer must set /SAFESEH:NO.
/NODEFAULTLIB:LIBCMT seems to eliminate many duplicate-symbol link errors.
|
|
|
|
files - we standardize on Xcode 6
|
|
unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
|
|
virtuals [-Woverloaded-virtual] and fix up first (of many) files
|
|
virtuals [-Wno-overloaded-virtual]
|
|
|
|
|
|
Release and Debug builds working. Remove the DOM_DYNAMIC define so
that we don't create declspec declarations to colladadom objects
and pull in libxml2_a (_a for archive) to complete the link. Debug
functional and would be moreso if not for all the CrtCheckMemory()
calls.
|
|
|
|
|
|
|
|
|
|
|
|
|
