1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 08:53:52 +00:00
Commit graph

1062 commits

Author SHA1 Message Date
Eli2
c59904062f Bump required CMake version to 3.16 2023-07-17 21:19:08 +02:00
elsid
11204d35d6
Use zlib directly for ESM4
Fallback to decompression by block of fixed size when decompressing the
whole archive fails.
2023-06-10 00:12:57 +02:00
jvoisin
8e3576022a Don't install boost-filesystem anymore 2023-04-25 23:26:29 +02:00
Andrei Kortunov
8df7ce545e Migrate from GraphicsWindowQt to QOpenGLWidget 2023-04-05 19:43:42 +04:00
elsid
6f6e452dfa
Add executable to run CS tests 2023-03-12 12:06:33 +01:00
elsid
cc066efa11
Fix identation in CMakeLists.txt 2023-03-10 15:28:06 +01:00
elsid
8031b9a16c
Use spaces only for identation in CMakeLists.txt 2023-03-10 15:01:24 +01:00
Cody Glassman
f729a28023 Fix executable for silicon builds
Partially reverts https://gitlab.com/OpenMW/openmw/-/merge_requests/1399
2023-02-25 11:10:00 -08:00
Bret Curtis
09f9203baa fix building and packaging issue with macos and qt plugins, they do not yet support versionless as it is a problem with cmake 2023-02-06 22:17:15 +01:00
Andrei Kortunov
7e2aedf637 Add an initial Qt6 support 2023-02-06 18:38:59 +04:00
elsid
6f1a434234
Check for more warnings 2023-02-04 00:10:32 +01:00
elsid
f1dbd9b959
Fix -Wduplicated-branches warnings 2023-02-04 00:10:30 +01:00
elsid
c79c14da91
Fix -Wnon-virtual-dtor warnings 2023-02-03 23:00:09 +01:00
elsid
a8a3ff9548
Fix setting OPENMW_CXX_FLAGS
Using ${OPENMW_CXX_FLAGS} as variable name means using underlying string value
which is not correct for fixed cases.
2023-02-03 22:59:26 +01:00
Andrei Kortunov
902c48d1bb Rework launcher UI 2023-01-15 12:36:08 +04:00
psi29a
f7f1832933 Merge branch 'luajit_custom_alloc' into 'master'
Check LuaJit version

See merge request OpenMW/openmw!2509
2022-11-27 09:14:35 +00:00
elsid
fdb731a6d0
Set collada_dom version before finding the package
The package cmake config uses wrong variables for minor and major versions. They
should be collada_dom_VERSION_MINOR and collada_dom_VERSION_MAJOR but they are
COLLADA_DOM_VERSION_MINOR and COLLADA_DOM_VERSION_MAJOR. CMake variables are
case sensitive so used variables are just empty strings. Set them manually as a
workaround.
2022-11-20 14:22:05 +01:00
Petr Mikheev
b6dd84c8ef Check LuaJit version 2022-11-18 02:08:40 +01:00
elsid
89884fae0b
Add link dependencies to libosgSim and collada-dom 2022-11-14 12:04:58 +01:00
elsid
063fff7fa4
Fix and prevent -Wextra-semi warning 2022-10-06 00:26:43 +02:00
Andrew Dunn
9f7e132479 Made CMake 3.19 requirement specific to macOS app packaging. 2022-09-22 00:49:24 +10:00
Andrew Dunn
e4f04390b5 Merge commit 'cd8b20439ec707574826679a8f851546c78e294e' into re-sign-mac-applications 2022-09-17 18:25:20 +10:00
Andrew Dunn
52501b7b65 Re-sign Mac Applications before creating install package
On Apple Silicon, the changes to linking paths done to "relativise"
paths in App bundles invalidates the code signature, so we need to
recalculate the signatures *after* the path changes have been performed
but before the install package is created. This depends on a new CMake
feature introduced in 3.19.
2022-09-17 18:24:06 +10:00
Bret Curtis
3e9510a89f reorg of cmake osg plugins; add osgSim and osgdb_dae requirements 2022-09-11 17:37:51 +02:00
Project579
e55caa9d20 Resolve issue #6931 Ugly warning with cmake 3.24 or newer 2022-09-10 12:56:03 +02:00
psi29a
e733dca907 Merge branch 'disable_cpp_extensions' into 'master'
Disable C++ extensions

See merge request OpenMW/openmw!2095
2022-08-10 22:33:33 +00:00
psi29a
75454c3c68 Merge branch 'go_49' into 'master'
Flip the switch on for 0.49

See merge request OpenMW/openmw!2256
2022-08-10 12:55:30 +00:00
Bret Curtis
bfd3ece818 Flip the switch on for 0.49 2022-08-09 23:09:57 +02:00
psi29a
b551e69b6f #5534 remove OSG 3.4 support and require at least 3.6.5 support 2022-08-09 21:07:28 +00:00
elsid
8e4f6fc4e4
Use FetchContent to get googletest 2022-08-04 01:12:11 +02:00
Andrei Kortunov
dd04bfccfb Load fonts 2022-07-17 22:01:48 +04:00
Project579
02ef9c953e MSVC: Fix all warnings at level 4, upgrade Qt5 to 5.15.2 to also reduce warnings, disabled 5054 warnings due to Qt5's use of deprecated operators in C++20 . 2022-07-17 11:23:12 +02:00
Project579
5ee825b5f6 Enable warnings as errors in MSVC builds. 2022-07-17 11:21:55 +02:00
Andrei Kortunov
c4bde18a9d Suppress warnings spam from Qt 2022-07-17 10:29:02 +04:00
elsid
0a94f95c95
Disable C++ extensions
Since openmw has to be compiled by clang, gcc, msvc most of the extensions
will not work anyway.
2022-07-04 23:39:10 +02:00
elsid
7e6c13630a Use target_precompile_headers for the most expensive headers 2022-07-01 14:05:17 +00:00
elsid
a40ec4edd6
Avoid D9025 warning by not adding /W3 by default using CMP0092 policy
See https://gitlab.kitware.com/cmake/cmake/-/issues/18317

Set policies before declaring the project otherwise they might not take effect.
Specifically CMP0092 does not have effect added after project.
2022-06-15 11:00:26 +02:00
psi29a
bb0dad7c08 Update to C++20 and see if our CI can handle it. 2022-06-12 08:00:11 +00:00
Benjamin Winger
248e3d3c2e macOS CI changes 2022-05-29 19:32:53 +00:00
elsid
ea295a2ac3
Fix build with lld linker
Boost.Filesystem started to depend on Boost.Atomic on 1.77.0 version but lld
can't find library on its own:

libboost_atomic.so.1.79.0 => not found
2022-05-22 15:27:48 +02:00
Petr Mikheev
7cd4222647 Update sol. Replace combined sol.hpp with loose files. 2022-05-15 21:34:55 +02:00
madsbuvi
dd5901d351 Initial commit
Multiview shaders.

Refactor Frustum management

Rewrite shared shadow map

cull mask should respect stereo

Stereo savegame screencap

LocalMap refactoring

use the vertex buffer hint instead of the display list patch to enable/disable display lists

Character preview fixes
2022-04-28 21:05:34 +02:00
Benjamin Winger
e3cedb5bfc
Set yaml-cpp and ICU as REQUIRED 2022-04-10 15:26:41 -04:00
Benjamin Winger
21ffbcc4b4 Lua i18n updates 2022-04-10 07:57:02 +00:00
elsid
e7f3524924
Add a tool to load and print information about all bullet objects in all cells 2022-02-04 16:14:52 +01:00
Timo Gurr
7e346fbbdd cmake: for now do not use CMAKE_INSTALL_DATAROOTDIR for GLOBAL_DATA_PATH 2022-01-30 21:39:28 +00:00
elsid
70623d0b23
Move FetchContent for benchmark to extern 2022-01-30 00:44:22 +01:00
Timo Gurr
71fe57f7a5 cmake: Use GNUInstallDirs to install data directories 2022-01-29 12:57:04 +00:00
Petr Mikheev
88a83bab1f Remove predefined data paths data="?global?data", data=./data (#6564) 2022-01-27 22:48:27 +01:00
uramer
886dee57ee Always use /bigobj, clean up scattered uses into one 2022-01-17 08:05:19 +00:00
uramer
94b2bde48a Raise required MyGUI version to 3.4.1 2021-12-16 16:59:20 +01:00
elsid
953a4c5550
Add a binary to generate navmesh from content files
Load content files based on the engine config files. Generate navmesh per cell
for all cells and store into SQLite database.
2021-12-11 00:21:56 +01:00
Bret Curtis
9336626927 use OPENMW_RESOURCES_ROOT instead 2021-12-08 14:33:49 +01:00
Bret Curtis
a9bf53d4ed modified builtin_scripts to be macOS aware; simplified things as the SHADER and MYGUI dir were just pointing to the OpenMW_BINARY_DIR anyway, so removing the code duplication 2021-12-08 14:28:56 +01:00
Petr Mikheev
d3df3efaf1 Precompile sol.hpp in order to reduce compilation time. 2021-12-04 11:32:39 +00:00
Brian Kelley
ee41b94a73 Enable compilation on apple silicon 2021-11-15 19:01:52 +00:00
wareya
db04dee29d Force MSVC to build in utf-8 mode 2021-11-04 10:09:48 -04:00
Bret Curtis
fa5581942e
Update CMakeLists.txt 2021-10-27 23:54:04 +02:00
Bret Curtis
1a51c6eb5d
Update CMakeLists.txt 2021-10-27 23:40:54 +02:00
Bret Curtis
cd358ce1f9
Update CMakeLists.txt 2021-10-27 11:48:17 +02:00
Bret Curtis
62b59a3c00
Update CMakeLists.txt 2021-10-23 12:56:02 +02:00
Bret Curtis
e65af0bf06
Silence all opengl deprecation warnings for MacOS
We know...
2021-10-23 10:48:37 +02:00
elsid
2bace703d5
Add dependency to SQLite3
This will be required by navmeshtool.
2021-10-11 19:34:07 +02:00
Evil Eye
a1825980c4 Define OpenMW specific C++ flags 2021-10-06 17:28:48 +02:00
Evil Eye
d680aa26e9 Disallow switch fallthrough 2021-10-03 21:58:10 +02:00
elsid
b9825afb8a
Fix build with system static OpenSceneGraph
* Add dependency to libraries required by OSG but missing when linking with OSG
  system library.
* Use find_package for already defined dependencies.
2021-09-17 19:59:11 +02:00
pi03k
e4eeb9cce9 Remove 'no relevant classes' moc warning 2021-09-14 11:20:18 +02:00
elsid
1b1deeb59b
Fail CI build when not allowed warnings are present
Put -Wno-error after -Wall to make it work properly for clang.
2021-09-05 02:06:03 +02:00
elsid
e9b8933b2f
Do no link binaries with Qt where it's not used
Define components_qt static library with all qt dependent components that also
depends on other components. Link only cs, wizard and launcher with qt
dependent components.
2021-08-20 19:02:09 +02:00
Bret Curtis
08a9abc46f get openmw building with LuaJIT on macos 2021-07-16 16:35:03 +02:00
Petr Mikheev
4db5fa351d Add sol3.2.2/sol/sol.hpp to extern instead of downloading during building 2021-07-12 11:46:32 +02:00
Petr Mikheev
9e168fd9cc Add Lua/LuaJit and sol3 to openmw 2021-07-09 19:27:00 +02:00
AnyOldName3
d38126ef1c Pack default CS config
*Technically* it was already being loaded as if it were packed, but it
made no difference because it's supposed to be empty.
2021-06-26 20:00:25 +01:00
Bret Curtis
36bb966ca1 Getting the ball rolling for 0.48 2021-06-18 23:16:03 +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
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
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
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
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