Commit Graph

44534 Commits (4d4caaaf1f5d0e486bdaa6fb57c00e04c201c6db)

Author SHA1 Message Date
Nicky 4d4caaaf1f Removed unused HEADLESS case. 2022-04-16 19:49:08 +02:00
Nicky ddc2c0265d slvoice_src_dir seems generally not used/ever valid. Not 100% sure
what's with that, maybe it gets set by LLs teamcity builds?
2022-04-16 19:36:15 +02:00
Nicky 1434b4ff96 Remove unused variable. 2022-04-16 19:35:27 +02:00
Nicky cc48def709 Initialize variables so that calling cmake with "--warn-unused-vars --warn-uninitialized" does
not make it go all crazy.
2022-04-16 18:03:04 +02:00
Nicky cf08197ad3 Use variable LLSTARTUP_COMPILE_FLAGS only when it is defined. 2022-04-16 17:30:54 +02:00
Nicky bb35d5a599 Remove some more obsolete includes (UnixInstall) and include_directories() 2022-04-16 17:30:09 +02:00
Nicky 924fa0fa78 create target ll::uilibraries to have one common target that defines what each
operation system needs as dependencies on OS gui libraries.
2022-04-16 17:28:26 +02:00
Nicky f673b958fe Go back to more modern way to compile the physics stub 2022-04-16 17:20:16 +02:00
Nicky 5803625db5 Remove undefined variable GOOGLE_PERFTOOLS_LIBRARIES 2022-04-16 17:18:38 +02:00
Nicky 3eec716b24 Do not use ${ARCH}_linux_INCLUDES atm 2022-04-16 17:17:32 +02:00
Nicky 7d6bb21c9c Remove unset GOOGLEMOCK_INCLUDE_DIRS variable. 2022-04-16 17:13:52 +02:00
Nicky 4c1ce6bd72 Fix a typo. 2022-04-16 17:13:28 +02:00
Nicky c0c5ac0e39 Only try copy voice files from slvoice_src_dir if that variable is set (seems to be the case for Windows) 2022-04-16 17:12:24 +02:00
Nicky e45a6a0f68 Remove obsolete message 2022-04-16 15:35:41 +02:00
Nicky a9774d3427 Request C++ standard via standard cmake. 2022-04-16 15:35:13 +02:00
Nicky b9f94c0897 Now there is a oslibrary target get rid of some more obsolete vars:
LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
2022-04-16 15:33:32 +02:00
Nicky bb85651d98 Create a new target ll::oslibrary to link against libs specific to the OS 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
2022-04-16 15:29:02 +02:00
Nicky c8eb53859f Remove unused code 2022-04-16 14:21:26 +02:00
Nicky 5aea7576b0 Simple reformat with CLion 2022-04-16 14:20:31 +02:00
Nicky db8bc69684 Dependency on target xml-rpc-epi got lost, bring it back 2022-04-13 21:27:27 +02:00
Nicky c3ed09fdda Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-04-13 19:29:08 +02:00
Nicky 6417836e69 FindSCP.cmake is used when INSTALL_PROPRIETARY is set. Not sure what the latter does, but I suppose
some internal logic on the LL build farm.
2022-04-13 19:27:02 +02:00
Nicky 241919e7f7 Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
but it's safer and saner to put the LL 3ps under the ll:: prefix.
This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13 19:21:55 +02:00
Nicky 2c9ede0ccc Remove another old remnant of the debug config. 2022-04-13 10:29:10 +02:00
Nicky d3521b4462 Remove obsolete and unmaintained USE_SYSTEMLIBS 2022-04-13 10:28:46 +02:00
Nicky 07d388f416 Make LIB_NDOF define part of the targets interface 2022-04-10 23:43:15 +02:00
Nicky d01e81f4d1 Fix warning supression for Linux/OSX, this was broken after the first round of cmake changes on Windows.
-Wno-unused-but-set-variable/-Wno-unused-variable moved from just Linux to also OSX (clang) as there's a lot of those
in the code where newer xcode complains. Fixing all those places is going beyond the scope of modernizing cmake.
2022-04-09 23:40:22 +02:00
Nicky 7382fce79e Cleanup windows step that copies input artifacts. Make sure the right
paths are used, throw out files not even existing anymore.
2022-04-09 20:19:46 +02:00
Nicky 0980a94341 Bump cmake version needed up to 3.16 so target_precompile_headers can be
used.
2022-04-09 20:15:07 +02:00
Nicky 37595f90f9 Cleanup ... use the appropriate functions to set options. Before
this everythig was over the place how it was set, worse even with wrong
functions like:
- add_definitions( /arch:SSE2 )
- add_definitions(/WX)
Those are each options to cl, not definitons.
2022-04-09 19:05:58 +02:00
Nicky 6e1ae6ec7b Raise the bar to cmake 3.13, this gives access to more modern
constructs.
2022-04-09 19:03:44 +02:00
Nicky 37f652206b Using Ninja leads to subtly different path than using a multi config generate like
xcode or visual studio.
2022-04-07 02:41:35 +02:00
Nicky 6cb984022a When opening contributions.txt viewer_manifest.py was making assumptios of the build
tree layout and how it should be relative to the source tree. This is not necessarily correct.
By using 'source' and constructiong the path relative to this directory we always get a correct
answer.
2022-04-07 02:39:30 +02:00
Nicky 4f2831c54b Remove some more traces of obsolte debug builds. 2022-04-07 02:38:38 +02:00
Nicky cca7e12e1b Bring packages formater step on par with 3p installation:
- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to
autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle
errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
2022-04-07 02:35:47 +02:00
Nicky 603ad5a4f2 OpenAL is not avaiable for OSX, error out in case someone selects ot. 2022-04-07 02:34:32 +02:00
Nicky 353ae84c90 CMake 3.8.0 compatibility for the ugly havok/stub 3p which really is
just a source tarball
2022-04-06 23:35:18 +02:00
Nicky 3bcb7fcc71 Remove noexistant include directory 2022-04-06 23:35:07 +02:00
Nicky e447e02312 CMake 3.8.0 compatibility 2022-04-06 23:33:06 +02:00
Nicky 248b6a2584 Don't bother with debug builds,, they are long deprecated. 2022-04-06 23:33:06 +02:00
Nicky d1b6a52fef Googlemock target 2022-04-06 23:33:06 +02:00
Nicky ef989bce37 On OSX llcommon also needs CMAKE_CURRENT_SOURCE_DIR as PRIVATE include dir. 2022-04-06 23:33:06 +02:00
Nicky be71a255a0 Set PNG link targets for OSX and Linux 2022-04-06 23:33:06 +02:00
Nicky dae6c3d2bf Remove erroneous characters. 2022-04-06 23:33:06 +02:00
Nicky e98a6b52ee Remove boost_signals, it is not included in the 3p package. 2022-04-06 23:33:06 +02:00
Nicky f6a5b2496d Create and use bugsplat target 2022-04-06 23:32:55 +02:00
Nicky 5f7c74fa2e Create and use sdl::sdl target 2022-04-06 20:25:49 +02:00
Nicky bed0b80374 Remove obsolete include directives 2022-04-06 20:23:54 +02:00
Nicky a4e2734372 Use kdu target 2022-04-06 20:23:21 +02:00
Nicky 495b35032c Remove erroneous lines. 2022-04-06 20:22:13 +02:00