1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-22 14:56:36 +00:00
Commit graph

1138 commits

Author SHA1 Message Date
Evil Eye
da68130c08 Turn VCREDIST into a cache variable 2024-12-11 20:38:23 +01:00
AnyOldName3
06bf80cc3b Rearrange conditionals to be prettier 2024-10-27 23:42:48 +00:00
AnyOldName3
62199c2dad Install the local openmw.cfg template on Windows
The Windows global config path is really really dumb and the whole concept of having a global path on an OS where it's so easy to have different incompatible versions installed side-by-side (instead of a single canonical OS-wide OpenMW install from the system package manager) is really dumb, too.

We've therefore only used local `openmw.cfg`s on Windows for a very long time.

However, it appears that we were installing the global `openmw.cfg` template instead of the local template.
That's wrong and we shouldn't do it, so I've stopped it.

I've left the separate `openmw.cfg` and `openmw.cfg.install` in the build directory as that makes doing development for portable installs with the same build system as doing the development for the installer easier.
2024-10-14 23:05:52 +01:00
Alexei Kotov
c5b54cf585 Update SDL controller mappings, bump SDL version requirement to 2.0.10 2024-10-05 21:14:41 +03:00
psi29a
6b762a5328 Merge branch 'fix-macos-libraries' into 'master'
Use CMAKE_FIND_FRAMEWORK ONLY for OpenGL on MacOS

Closes #7934

See merge request OpenMW/openmw!4368
2024-09-11 08:29:57 +00:00
Cody Glassman
b346a4a858 Add frame number to available postprocess uniforms 2024-09-10 16:58:27 +00:00
Chris Anderson
3320f2a5b9 Use CMAKE_FIND_FRAMEWORK ONLY for OpenGL on MacOS 2024-09-09 21:56:37 -04:00
psi29a
1e94f53146 Merge branch 'is_starter_spell' into 'master'
Expose starter spells

See merge request OpenMW/openmw!4352
2024-09-06 07:25:09 +00:00
psi29a
e1875d459a Merge branch 'boost-config-required' into 'master'
Modernise Boost CMake stuff

Closes #8100

See merge request OpenMW/openmw!4307
2024-09-04 19:04:57 +00:00
Mehdi Yousfi-Monod
20bd83b280 bumped Lua API version 2024-09-03 16:54:37 +02:00
Mads Buvik Sandvei
2faf7036f5 bump lua api revision 2024-08-26 14:03:20 +02:00
AnyOldName3
387b63909b Remove vestigial Boost libraries
Boost::zlib is basically part of Boost::iostreams, and depending on how you configure Boost, it can either be a separate library or get embedded into iostreams.
With the third-party-but-linked-on-Boost's-website package we've been using for years, it's a separate library.
Before https://gitlab.com/OpenMW/openmw/-/merge_requests/4307, we needed to explicitly link with it as CMake wasn't handling transitive dependencies for us.
With vcpkg, it's embedded, and doesn't have its own CMake config, so we couldn't explicitly link with it even if we wanted to.

Now CMake *is* handling transitive dependencies for us, we don't even need to think about this library.
It's all automatic.

Boost::locale, on the other hand, used to be something we used directly (I think for doing UTF-16/UTF-8 conversions when dealing with Windows paths).
However, it isn't anymore, and we just didn't purge it from our CMake when we should have.
It can go.
2024-08-23 14:06:13 +01:00
AnyOldName3
26be98966f Modernise Boost CMake stuff
Resolves https://gitlab.com/OpenMW/openmw/-/issues/8100

Also removes some old crud.
Hopefully the old crud is all:
* Handled automatically by CMake now we're using the modern approach.
* A hack-fix for a problem caused by not using the modern approach.
* Massively outdated so no longer necessary.

If it turns out this makes CI fail, I'll tweak things as necessary.

Changes that might not be wanted include:
* Getting rid of our BOOST_STATIC CMake option. In cases where the CMake config doesn't make the one correct choice from the build environment (i.e. because there's a choice) the CMake config exposes the option already.
  However, we were forcing this on for Windows, so that might matter.
  It seems to default to static on my machine even though I thought I read something suggesting otherwise, so we'll see how things go with that.
  If we eventually put CMake in charge of installing dependency DLLs this will be a moot point as we won't need to care.
* Bumping the minimum version of Boost to 1.70.0, as that's the first with working CMake config.
  It's from 2019, so plausibly there are distros too scared to use a library from five years ago as it can't legally drink in the US (although it could in limited quantities with parental supervision in the UK, as long as it's just something inconsequential like a single sip of beer).
2024-08-23 14:06:13 +01:00
uramer
d8cd0788e4 Merge branch 'madsbuvi-master-patch-56327' into 'master'
Update lua api revision

See merge request OpenMW/openmw!4320
2024-08-14 08:02:21 +00:00
Mads Buvik Sandvei
fadcf5d255 Update lua api revision 2024-08-13 18:46:28 +00:00
elsid
e186e4f7ae
Remove no longer required FindRecastNavigation.cmake
It's possible to find the library without having it. But also it prevents target
options from propagation to the openmw targets.
2024-08-13 10:47:33 +02:00
Dave Corley
c90af583b2 FEAT(CMakeLists): Increment API revision 2024-07-23 14:39:59 -05:00
Evil Eye
ee653eb2b8 Make mwscript return nil for records that don't have a script 2024-07-07 13:58:34 +02:00
psi29a
ef0bb02def Merge branch 'master' into 'master'
An ability to specify attack type in controls.use value

See merge request OpenMW/openmw!4187
2024-07-05 08:12:17 +00:00
Max Yari
723c64a79b Lua API version increment 2024-07-01 19:58:33 +02:00
Jared Davenport
06b0f6b970 Update CMakeLists.txt 2024-07-01 13:40:09 +00:00
Jared Davenport
3a8bafd7b1 doesn't detect correct ffmpeg version for android 2024-07-01 05:04:32 +00:00
Jared Davenport
fcb9fafd15 remove cmakefix.patch
for android this is an issue during the cmake process.
2024-06-27 18:00:42 +00:00
Bret Curtis
1ccf101a92 REQUIRED flag will get rid of need to have extra if check 2024-06-15 11:12:11 +02:00
Bret Curtis
1edcd80501 consolidate cmake documentation flow 2024-06-15 11:07:35 +02:00
elsid
7d1cd11ba9
Split openmw_test_suite into openmw and components tests
To avoid duplicated compilation for openmw translation units. Link openmw-lib to
openmw-tests instead.
2024-06-10 23:12:14 +02:00
Bret Curtis
3c04e9f77e [#7016] Add additional docs to macos dmg and windows release 2024-05-21 17:43:02 +02:00
trav5
5d683f7b36 ESM::Dialogue Lua bindings: API_REVISION updated to 62 2024-05-04 16:38:53 +02:00
trav5
f121c0ea72 ESM::Dialogue Lua bindings: API_REVISION updated 2024-04-27 22:27:59 +02:00
psi29a
3980bb15cc Merge branch 'lua_controller_cursor' into 'master'
Add lua bindings for controller cursor mode

See merge request OpenMW/openmw!3623
2024-04-25 08:45:57 +00:00
Zackhasacat
55f4f6a5bf Update API_REVISION 2024-04-24 18:06:24 -05:00
Andrei Kortunov
1bb48bcef7 Treat editor icons as scalable 2024-04-21 20:56:06 +04:00
psi29a
e4c70b7861 Merge branch 'anyoldname3-and-the-amazing-technicolour-terminal-emulator' into 'master'
Support coloured terminal output on Windows

See merge request OpenMW/openmw!4027
2024-04-17 13:09:07 +00:00
Andrei Kortunov
1ad9e5f9e8 Rework editor icons 2024-04-14 08:17:10 +04:00
AnyOldName3
901a17ab81 Make comments stop lying 2024-04-13 19:01:34 +01:00
AnyOldName3
ea029b06ea Remove unused define 2024-04-13 18:51:45 +01:00
Andrei Kortunov
8fecbb55ff Do not store 'location' tags in translation files 2024-04-05 10:12:31 +04:00
Evil Eye
4607722ce9 Increment API version 2024-03-31 11:37:02 +02:00
Andrei Kortunov
009ccca978 Modify sound API permissions 2024-03-15 19:48:43 +04:00
psi29a
d746918563 Merge branch 'yaml_parse' into 'master'
Load YAML files via Lua

Closes #7590

See merge request OpenMW/openmw!3924
2024-03-15 11:02:05 +00:00
Andrei Kortunov
715efe892f Load YAML files via Lua (feature 7590) 2024-03-14 16:29:21 +04:00
AnyOldName3
7b89ca6bb2 Make CCache work for MSVC builds with debug symbols 2024-03-10 01:31:55 +00:00
elsid
5859fd464c
Add option to disable precompiled headers
To be able to use ccache.

Also fix compilation errors appeared due to absence of precompiled
headers.
2024-03-08 02:11:51 +01:00
psi29a
231b5753e4 Merge branch 'launcher_help_version' into 'master'
Open matching version of documentation for Launcher Help

See merge request OpenMW/openmw!3909
2024-03-05 09:24:52 +00:00
Andrei Kortunov
ddd0945645 Add a storage mode to drop section on game exit 2024-02-27 23:26:22 +04:00
uramer
86a82ae3f1 Open matching version of documentation for Launcher Help 2024-02-25 18:20:40 +01:00
Evil Eye
595e42ae43 Merge branch 'lua_death_finished' into 'master'
Add a Lua function to check if actor's death is finished

See merge request OpenMW/openmw!3901
2024-02-24 10:31:15 +00:00
Andrei Kortunov
7c4b42ab2a Add a Lua function to check if actor's death is finished 2024-02-22 19:06:15 +04:00
AnyOldName3
132c43affa Fix warning
Also attempt to make an equivalent warning fire with MSVC, then have to fix other stuff because /WX wasn't working, then back out of enabling the warning because none of the ones I could find disliked the old code.
2024-02-20 22:14:13 +00:00
psi29a
1280345296 Merge branch 'copy_qtbase' into 'master'
Copy qtbase translations

See merge request OpenMW/openmw!3840
2024-02-15 09:26:42 +00:00
Andrei Kortunov
9a7b9572fd Deploy base Qt translations when needed 2024-02-15 09:26:14 +04:00
Cody Glassman
56b31ceaf5 add ignore list to raycasts 2024-02-12 07:52:47 -08:00
uramer
04985399f4 Lua API revision 53 2024-02-06 11:32:42 +01:00
Andrei Kortunov
66b2d428c8 Merge branch 'qt_localization' into 'master'
Localize Launcher and Wizard

See merge request OpenMW/openmw!3571
2024-02-05 15:11:42 +00:00
Anton Uramer
5bd641d2dd Lua API Revision 52 2024-02-02 12:53:03 +01:00
Andrei Kortunov
7e345436f4 Localize Launcher and Wizard 2024-02-01 09:47:25 +04:00
Bret Curtis
d16b1ca54e make macos use openal-soft 2024-01-08 22:37:44 +01:00
jvoisin
d1fc34a0d9 Merge branch 'sdl2_cmake' into 'master'
Use SDL2 generate cmake files to find the package

See merge request OpenMW/openmw!3612
2023-11-25 15:02:47 +00:00
elsid
f08ab9af56
Use SDL2 generate cmake files to find the package 2023-11-24 15:56:54 +01:00
elsid
829a9160c3
Enable __cplusplus for MSVC
To build OpenSceneGraph with osg::ref_ptr move constructor. This affects only
code in the OpenMW itself including the file defining the constructor.
2023-11-23 00:04:54 +01:00
Zackhasacat
35da9578ca Merge gitlab.com:openmw/openmw into lua_class_data 2023-11-16 11:33:44 -06:00
Zackhasacat
2ce99b0c7f Increment API_REVISION 2023-11-16 11:08:57 -06:00
Cody Glassman
de8c93d049 [Postprocessing] Add an API version, mirroring Lua 2023-11-16 15:24:16 +00:00
Bret Curtis
e97b07b6a4 additional cleanup 2023-10-17 23:53:04 +02:00
Petr Mikheev
15306c7d49 [Lua] Add CONTROL_SWITCH functions to types.Player and deprecate them in openmw.input 2023-10-10 01:15:09 +02:00
Bret Curtis
2ac4cb6d58 1.6.2 is old, but apparently still okay 2023-09-27 16:49:24 +02:00
Bret Curtis
86127093ba drop atomic as we no longer need it as we droped boost::threads a long time ago 2023-09-27 16:47:44 +02:00
Evil Eye
6ed5cbb7d0 Remove numeric magic school ids and deprecate the enum 2023-09-20 19:51:29 +02:00
Andrei Kortunov
64db68e0aa Increase Lua API version 2023-09-13 09:12:42 +04:00
Andrei Kortunov
6ee86dea82 Implement Lua API for factions (feature 7468) 2023-09-12 09:49:03 +04:00
Andrei Kortunov
c04a0ca3a5 Implement Lua API for VFS 2023-09-02 08:47:46 +04:00
Petr Mikheev
f260fa006e Show OpenMW version and Lua API revision in documentation. 2023-08-31 20:56:02 +02:00
psi29a
8d1a19a6f4 [#7358] Make MyGui 3.4.2 required for 0.49 2023-08-06 16:05:59 +00:00
psi29a
c688bd20b4 Merge branch 'removeinstallingemptydatadir' into 'master'
Prevent installing redundant empty data directory

See merge request OpenMW/openmw!3253
2023-07-21 08:39:21 +00:00
Timo Gurr
af6d586def Prevent installing redundant empty data directory
Complement 88a83bab1f which removed the
global data directory from config.
2023-07-20 03:54:23 +02:00
AnyOldName3
34fcfb63cf Eliminate redundant version checks 2023-07-20 00:43:56 +01:00
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