mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 13:19:56 +00:00
Code Issues Releases Wiki Activity
28344 commits 38 branches 54 tags 122 MiB
Commit graph

1035 commits

Author SHA1 Message Date
Grim Kriegor
aa35f0946f [Buildsys] Tweaks to allow server-only builds 
Re-include Base64, Boost and SDL2[1]

Exclude OSG but keep its headers[2]

Exclude most non-essential components and their deps

[1] SDL2 is required by the debug component
May be worth deviating from upstream by making its inclusion
conditional in the future

[2] Server component requires declarations present in the OSG headers
 2022-02-08 18:32:43 +00:00
Grim Kriegor
57c2ed2557 [Buildsys] Do not require Bullet for the server 2022-02-07 01:13:14 +00:00
David Cernat
0567dc1fd4 Add OpenMW 0.47 commits up to 25 Jul 2021 2021-07-25 22:29:47 +02:00
psi29a
109a7c3daf Merge branch 'base64-fixes' into 'master' 
Base64 fixes

Closes #6111

See merge request OpenMW/openmw!965

(cherry picked from commit 07c3ed16d0e05df8724b1f45696e9d17a2111938)

873b3b48 Handle empty strings.
d38126ef Pack default CS config
 2021-07-02 06:27:36 +00:00
David Cernat
62f0237376 Add OpenMW commits up to 17 Jun 2021 2021-06-17 10:33:19 +02:00
psi29a
dd197765c8 cmake check to enforce that if someone uses OSG 3.6, that it is at least 3.6.5 2021-06-16 08:28:48 +00:00
David Cernat
7a6dfc61ec Add OpenMW commits up to 21 May 2021 
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwscript/interpretercontext.cpp
#   components/CMakeLists.txt
 2021-05-21 16:00:09 +02:00
psi29a
e9fbd76e9b Merge branch 'windows_tests' into 'master' 
Support running tests and benchmarks for windows

See merge request OpenMW/openmw!839
 2021-05-18 08:12:22 +00:00
psi29a
4bc7012104 Merge branch 'pack-default-settings' into 'master' 
Pack default settings

Closes #5925

See merge request OpenMW/openmw!822
 2021-05-18 08:11:13 +00:00
AnyOldName3
081650a2e5 Integrate Base64 library with build 2021-05-17 23:00:23 +01:00
psi29a
b583c2300c Merge branch 'maybe-fix#5551' into 'master' 
Fix #5551

Closes #5551

See merge request OpenMW/openmw!802
 2021-05-17 08:16:02 +00:00
Andrei Kortunov
963e1b8b3f Fix MSVC's C4244 warnings 2021-05-12 10:34:40 +04:00
Andrei Kortunov
f9d42ed396 Fix MSVC's C4267 warnings 2021-05-12 10:34:39 +04:00
elsid
4d7e5245a3
Support benchmarks for windows 
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
 2021-05-11 13:16:59 +02:00
AnyOldName3
0d737a3501 Create defaults.bin at configure time 2021-05-09 21:00:49 +01:00
David Cernat
ea6d5c68ae Add OpenMW commits up to 6 May 2021 
# Conflicts:
#   CMakeLists.txt
#   components/CMakeLists.txt
 2021-05-06 23:32:48 +02:00
Bret Curtis
4f5d697e2b Do not fail when unable to detect the FFMPEG version, like windows. 2021-05-05 10:36:34 +02:00
Gleb Mazovetskiy
e3a6cb1695 Remove OsIdentity.cmake 
Removes the OsIdentity.cmake file and uses a cross-compilation friendly
and OS-independent method of detecting system double-precision bullet
instead.
 2021-05-03 00:08:47 +01:00
psi29a
7f7041656d Merge branch 'enforce_double_bullet' into 'master' 
Remove support for single-precision Bullet, fail during configuration instead of during linking (#5980)

See merge request OpenMW/openmw!806
 2021-05-02 20:52:57 +00:00
David Cernat
a3f304107b Add OpenMW commits up to 2 May 2021 
# Conflicts:
#   components/CMakeLists.txt
 2021-05-02 20:55:49 +02:00
fredzio
6fd04cb8f6 Remove support for single-precision Bullet, fail during configuration instead of during linking. 2021-05-02 17:48:50 +02:00
AnyOldName3
1626762d5c Maybe fix #5551 
If we were doing this properly, we'd migrate to
https://cmake.org/cmake/help/latest/module/InstallRequiredSystemLibraries.html
but this should hopefully remove a blocker for 0.47
 2021-05-01 22:20:51 +00:00
Chris Djali
f0cef87cd8
Merge pull request #3069 from akortunov/msvc_warnings 
Rework warnings settings
 2021-05-01 19:03:43 +01:00
psi29a
16bb3919d1 Merge branch 'navmesh_cache_simplification' into 'master' 
Simplify navmesh cache

See merge request OpenMW/openmw!691
 2021-04-28 08:01:06 +00:00
Andrei Kortunov
8aa76ff540 Use W4 instead of Wall for MSVC 2021-04-23 22:54:02 +04:00
Andrei Kortunov
f2f2c3d873 Disable -Wsuggest-override again since we have no control over code from FetchContent 2021-04-21 09:28:51 +04:00
Andrei Kortunov
1b1c786d0c Do not suppress fixed MyGUI warnings 2021-04-19 15:34:22 +04:00
Andrei Kortunov
f308dde254 Clean up MSVC warnings 2021-04-17 12:14:50 +04:00
elsid
b9a40bc5fc
Add NavMeshTilesCache benchmarks 2021-03-25 19:28:41 +01:00
David Cernat
59cb31e0a7 Add OpenMW commits up to 20 Mar 2021 
# Conflicts:
#   apps/openmw/CMakeLists.txt
#   apps/openmw/mwmechanics/aipursue.cpp
#   components/CMakeLists.txt
 2021-03-20 16:44:11 +02:00
Gleb Mazovetskiy
493659d4f9 MSVC: extern/ tweaks to make it build 
Not everything is supported but it does build with the following CMakeSettings.json
variables and dependencies from vcpkg:

      "variables": [
        { "name": "OPENMW_USE_SYSTEM_BULLET", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_MYGUI", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_OSG", "value": "False", "type": "BOOL" },
        { "name": "BULLET_STATIC", "value": "True", "type": "BOOL" },
        { "name": "OSG_STATIC", "value": "False", "type": "BOOL" },
        { "name": "MYGUI_STATIC", "value": "False", "type": "BOOL" }
      ],

What works: it builds

What does not work: Not all DLLs are copied into the output directory with this set up
(SDL2, MyGUI, Bullet, OSG, are not copied).
 2021-03-16 19:52:10 +00:00
Gleb Mazovetskiy
f460ab2152 MSVC: Fix build with vcpkg's boost 
boost-zlib is not present (nor needed) in vcpkg version of boost
There, it is part of boost-iostreams instead.

This was previously reported in:
https://gitlab.com/OpenMW/openmw/-/merge_requests/213#note_348625016
 2021-03-16 01:36:07 +00:00
AnyOldName3
450b971bb0 Merge branch 'gl4es-patch' into 'master' 
gl4es: Delay feature detection until a context exists

See merge request OpenMW/openmw!626
 2021-03-10 19:01:39 +00:00
Bret Curtis
c4064fca0c include feedback and add DebugUtils and Detour 2021-03-02 23:11:06 +01:00
Bret Curtis
28cb14289a initial attempt at FindRecastNavigation.cmake 2021-03-02 22:48:17 +01:00
Gleb Mazovetskiy
044e784072 gl4es: Delay feature detection until a context exists 
gl4es feature detection does not work reliably with EGL.

If a context already exists, gl4es can instead reliably detect
the underlying GLES features from the context itself.

This requires gl4es to be configured with:

    -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON

This also requires gl4es to have this fix: https://github.com/ptitSeb/gl4es/pull/271
 2021-02-28 07:59:48 +00:00
David Cernat
39dc6fc355 Add OpenMW commits up to 24 Feb 2021 
# Conflicts:
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/CMakeLists.txt
#   components/CMakeLists.txt
 2021-02-24 13:02:57 +02:00
psi29a
96b5581930 Merge branch 'fetchcontent-recast-navigation' into 'master' 
Move recastnavigation to FetchContent

Closes #5793

See merge request OpenMW/openmw!614
 2021-02-20 00:36:42 +00:00
Gleb Mazovetskiy
e265d0bc2b Fix OSGPlugins_LIB_DIR on the MacOS build 
Moves auto-detection of OSGPlugins_LIB_DIR into FindOSGPlugins.cmake.

This should hopefully fix the error in the MacOS build.
 2021-02-19 19:00:24 +00:00
Gleb Mazovetskiy
1c9245bd58 Move recastnavigation to FetchContent 2021-02-19 18:35:34 +00:00
psi29a
5c0214142b Merge branch 'static-build' into 'master' 
Optional local source builds of OSG, MyGUI, Bullet

See merge request OpenMW/openmw!547
 2021-02-19 16:58:05 +00:00
AnyOldName3
c97980a0f6 Don't force linker to work with doubly-defined symbols 2021-02-11 01:35:32 +00:00
David Cernat
e1259fdc41 Add OpenMW commits up to 4 Feb 2021 
# Conflicts:
#   apps/openmw/engine.cpp
#   apps/openmw/mwmechanics/npcstats.hpp
#   apps/openmw/mwrender/globalmap.cpp
 2021-02-05 02:16:03 +02:00
Gleb Mazovetskiy
3d334dae75 Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
daf080ff19 cmake: Move MYGUI/OSG_STATIC default to top-level 
Makes it clear that the USE_SYSTEM variables affect the defaults of
STATIC variables.
 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
26814b2386 CMakeLists.txt: Restore policies as we unbumped cmake version 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
98564b0aae cmake: move cmake_minimum_required bump to extern/CMakeLists.txt 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
a06f598442 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) before add_subdirectory(extern) 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
8737453498 cmake: Compiler-specific whole-archive macro 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
93fe84aea8 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level 2021-01-26 19:00:55 +00:00