71bea5fc00
[VR Build] Rename VR client executable
3 years ago
339a196579
Add OpenMW VR commits up to 4 Jul 2021
...
# Conflicts:
# CMakeLists.txt
# LICENSE
# README.md
# apps/openmw/CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwinput/bindingsmanager.cpp
# apps/openmw/mwmechanics/combat.cpp
3 years ago
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
3 years ago
57c2ed2557
[Buildsys] Do not require Bullet for the server
3 years ago
572b16af41
Add OpenMW 0.47 commits to OpenMW VR up to 4 Dec 2021
...
# Conflicts:
# .gitlab-ci.yml
# CI/before_script.msvc.sh
# CI/install_debian_deps.sh
# CMakeLists.txt
# apps/openmw/mwrender/screenshotmanager.cpp
# files/ui/advancedpage.ui
3 years ago
0567dc1fd4
Add OpenMW 0.47 commits up to 25 Jul 2021
3 years ago
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
4 years ago
62f0237376
Add OpenMW commits up to 17 Jun 2021
4 years ago
dd197765c8
cmake check to enforce that if someone uses OSG 3.6, that it is at least 3.6.5
4 years ago
7a6dfc61ec
Add OpenMW commits up to 21 May 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/interpretercontext.cpp
# components/CMakeLists.txt
4 years ago
e9fbd76e9b
Merge branch 'windows_tests' into 'master'
...
Support running tests and benchmarks for windows
See merge request OpenMW/openmw!839
4 years ago
4bc7012104
Merge branch 'pack-default-settings' into 'master'
...
Pack default settings
Closes #5925
See merge request OpenMW/openmw!822
4 years ago
081650a2e5
Integrate Base64 library with build
4 years ago
b583c2300c
Merge branch 'maybe-fix#5551' into 'master'
...
Fix #5551
Closes #5551
See merge request OpenMW/openmw!802
4 years ago
963e1b8b3f
Fix MSVC's C4244 warnings
4 years ago
f9d42ed396
Fix MSVC's C4267 warnings
4 years ago
4d7e5245a3
Support benchmarks for windows
...
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
4 years ago
0d737a3501
Create defaults.bin at configure time
4 years ago
ea6d5c68ae
Add OpenMW commits up to 6 May 2021
...
# Conflicts:
# CMakeLists.txt
# components/CMakeLists.txt
4 years ago
4f5d697e2b
Do not fail when unable to detect the FFMPEG version, like windows.
4 years ago
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.
4 years ago
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
4 years ago
a3f304107b
Add OpenMW commits up to 2 May 2021
...
# Conflicts:
# components/CMakeLists.txt
4 years ago
6fd04cb8f6
Remove support for single-precision Bullet, fail during configuration instead of during linking.
4 years ago
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
4 years ago
f0cef87cd8
Merge pull request #3069 from akortunov/msvc_warnings
...
Rework warnings settings
4 years ago
16bb3919d1
Merge branch 'navmesh_cache_simplification' into 'master'
...
Simplify navmesh cache
See merge request OpenMW/openmw!691
4 years ago
f4e36f4be5
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
4 years ago
8aa76ff540
Use W4 instead of Wall for MSVC
4 years ago
f2f2c3d873
Disable -Wsuggest-override again since we have no control over code from FetchContent
4 years ago
1b1c786d0c
Do not suppress fixed MyGUI warnings
4 years ago
f308dde254
Clean up MSVC warnings
4 years ago
1bee59c2b1
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
4 years ago
b9a40bc5fc
Add NavMeshTilesCache benchmarks
4 years ago
59cb31e0a7
Add OpenMW commits up to 20 Mar 2021
...
# Conflicts:
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/aipursue.cpp
# components/CMakeLists.txt
4 years ago
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).
4 years ago
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
4 years ago
450b971bb0
Merge branch 'gl4es-patch' into 'master'
...
gl4es: Delay feature detection until a context exists
See merge request OpenMW/openmw!626
4 years ago
c4064fca0c
include feedback and add DebugUtils and Detour
4 years ago
28cb14289a
initial attempt at FindRecastNavigation.cmake
4 years ago
d598923421
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
4 years ago
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
4 years ago
2923174f9a
Added a list of setting overrides
4 years ago
39dc6fc355
Add OpenMW commits up to 24 Feb 2021
...
# Conflicts:
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# components/CMakeLists.txt
4 years ago
96b5581930
Merge branch 'fetchcontent-recast-navigation' into 'master'
...
Move recastnavigation to FetchContent
Closes #5793
See merge request OpenMW/openmw!614
4 years ago
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.
4 years ago
1c9245bd58
Move recastnavigation to FetchContent
4 years ago
5c0214142b
Merge branch 'static-build' into 'master'
...
Optional local source builds of OSG, MyGUI, Bullet
See merge request OpenMW/openmw!547
4 years ago
c97980a0f6
Don't force linker to work with doubly-defined symbols
4 years ago
e1259fdc41
Add OpenMW commits up to 4 Feb 2021
...
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwrender/globalmap.cpp
4 years ago
David Cernat
Grim Kriegor
psi29a
AnyOldName3
Andrei Kortunov
elsid
Bret Curtis
Gleb Mazovetskiy
fredzio
AnyOldName3
Chris Djali
madsbuvi