62053e1e88
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-05-07 18:10:29 +02:00
42820f834f
Remove unused LL_ARCH/LL_ARCH_DIR
2022-05-07 17:29:16 +02:00
07a7c4e190
ADDRESS_SIZE auto detection was broken with python3, fix this.
...
- Simplify detection by using regex
- OSX is always 64 bit
2022-05-07 17:23:20 +02:00
d6c170a66d
Cache ENV{LL_BUILD} to LL_BUILD_ENV:
...
- ENV{LL_BUILD} takes precedence
- if ENV{LL_BUILD} is not set but LL_BUILD-ENV is, set ENV{LL_BUILD} to
the cached version
- error if none of the two is set
Caching the variable and reusing it lets cmake run when not called by
autobuild itself. This happens when xcode or visual studio detect it
needs to be re rerun and call it for the "cmake" target. Not having
LL_BUILD then makes those targets fail.
2022-05-07 17:00:27 +02:00
09e38c5caa
Remove logging.
2022-05-07 17:00:01 +02:00
767464a262
Adapt gnerator expression usage to work on OSX.
2022-05-07 02:19:51 +02:00
43a338c627
Merge branch 'master' into DRTVWR-543-maint_cmake
2022-05-04 18:50:59 +03:00
bc7e2fb7e7
Increment viewer version to 6.5.6
...
following promotion of DRTVWR-550
2022-05-04 11:37:24 -04:00
932455384b
Another place that needed generator expressions.
2022-05-01 15:14:34 +02:00
b75fe14716
Fix for viewer_manifest.py using a hardcoded path to grab runtime files.
2022-05-01 14:51:02 +02:00
db423fa972
${AUTOBUILD_INSTALL_DIR}/lib/release is always needed as a fallback
...
linking directory.
2022-05-01 13:53:22 +02:00
756a10eeac
Simplify cmake files by uaing generator expressions and be more
...
configuration specific, rather than staging files to Release and
RelWithdebInfo all the time
2022-05-01 13:37:44 +02:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02:00
56a1bc850b
SL-17223 fix unit tests with new method stub implementation
2022-04-25 13:44:38 -07:00
372a04dd51
Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get lost in case of crash
2022-04-25 12:35:07 -07:00
4c34a02751
Setting openal option in cache had gone poof.
2022-04-23 18:36:49 +02:00
fb4aab3144
SL-17246 Fix getSharedPrt typo
2022-04-20 00:51:13 +03:00
9e2cdf5cc2
SL-17242 Use proper cap for setting pathfinding attributes
2022-04-20 00:49:58 +03:00
d6b34d41af
Finishing touches, making sure even with conan all needed 3ps are installed and usable.
...
This brings the source to be able to run tests in conan mode.
2022-04-19 20:28:34 +02:00
e9921e77b0
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-04-18 13:29:25 -07:00
ca839307f9
Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake
2022-04-18 19:57:34 +02:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
d031662435
Increment viewer version to 6.5.5
...
following promotion of DRTVWR-540
2022-04-18 13:25:21 -04:00
2b151e0aef
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
2022-04-18 18:11:43 +02:00
dcfb94fbac
- More include changes for xmlrpc.h
...
- New versions of curl have the same value for CURLE_SSL_PEER_CERTIFICATE and CURLE_SSL_CACERT
2022-04-18 18:05:37 +02:00
0319ed6611
Another instance where LLFilePicker::getSaveFile had the wrong number of arguments.
2022-04-18 17:05:31 +02:00
51e5437721
Use correct namespace for bind, must be phoenix::bind or there is confusion with boost::bind
2022-04-18 17:00:35 +02:00
9bbd038733
in case of systemlibs (conan right now), xmlrpc header structure is slightly different.
2022-04-18 16:52:39 +02:00
29ca856038
llrender does not need a dependency on sdl. There was some comment out code which
...
suggests it was needed long ago.
2022-04-18 16:50:17 +02:00
bacbf1ffe6
ASN1_STRING_data is depreacted.
2022-04-18 16:49:17 +02:00
46402bd527
Correctio for preproc #else
2022-04-18 16:48:39 +02:00
b532c2986b
Add argument missing from implementation
2022-04-18 16:47:54 +02:00
7038e3e358
Use correct type
2022-04-18 16:46:59 +02:00
7a66e77694
Remove some remnants of breakpad.
2022-04-18 03:44:09 +02:00
da24787167
Enable LL_OS_DRAGDROP_ENABLED for Linux
2022-04-18 03:43:42 +02:00
98ef249470
Need to use list( APPEND ... to append to a list.
2022-04-18 03:42:26 +02:00
5aa81b1659
Remove obsolete targets and dependencies.
2022-04-18 03:14:49 +02:00
e180278477
zlib-ng for Linux is still broken. This needs revisiting, but at least gets up compiling for now.
2022-04-18 03:13:39 +02:00
defdbaf40d
Fixup for Linux media plugins.
...
- Remove VLC
- Remove missing cmake includes (that got deleted in earlier changes) from gstreamer plugin.
2022-04-18 03:12:19 +02:00
a9f4e88a30
Introduce ll::fontconfig target (missing the correct link library, but at least this gets us compiling)
2022-04-18 03:10:54 +02:00
d65a5832bf
ll::sdl had a wrong include directory.
2022-04-18 03:10:02 +02:00
4416db9a26
Remvoe -D that had been passed in front of each entry of add_compile_definitions, this lead to '-D-D<value>'
2022-04-18 03:08:46 +02:00
e743efcc48
- Change OpenAL to OPENAL to match the correct filename, Windows and OSX use case insesitive fielsystem, this is why it was not issues there
...
- Remove input files that are obsolete.
2022-04-18 03:05:06 +02:00
54f8d5c380
Bring in first steps of Linux64:
...
- Add the configuratons Release and ReleaseOS
- The js files are platform independent, just copy the ones from windows64.
2022-04-18 03:02:50 +02:00
1966d837e1
jsoncpp includepath should not include json/. jsoncpp includes a header "features.h"
...
which has the same name as a glibc header, allowing this header to be found without any prefix
will lead to head conflicts when there is a '#include "features.h"'
As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
2022-04-18 02:50:43 +02:00
363f2df4fa
Remove function create_target and instead directly use add_library
2022-04-17 18:28:55 +02:00
e0cf0cdfd4
Switch to target_include_directories
...
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.
2022-04-17 18:04:57 +02:00
6d0bba9c03
Switch over to standard target_link_libraries (cmake requirements are high enough now).
2022-04-17 17:32:14 +02:00
34b5c5e890
Switch to USE_OPENAL
2022-04-16 23:01:00 +02:00
5994ca8531
Remove another place where there was some hand crafted logic to deal with bugsplat defines
2022-04-16 22:58:06 +02:00
Nicky