Commit Graph

1087 Commits (8cb5f2a5673165d732790e6440e9cd90b71074d4)

Author SHA1 Message Date
AnyOldName3 06bf80cc3b Rearrange conditionals to be prettier 2 months ago
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.
3 months ago
Alexei Kotov c5b54cf585 Update SDL controller mappings, bump SDL version requirement to 2.0.10 3 months ago
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
4 months ago
Cody Glassman b346a4a858 Add frame number to available postprocess uniforms 4 months ago
Chris Anderson 3320f2a5b9 Use CMAKE_FIND_FRAMEWORK ONLY for OpenGL on MacOS 4 months ago
psi29a 1e94f53146 Merge branch 'is_starter_spell' into 'master'
Expose starter spells

See merge request OpenMW/openmw!4352
4 months ago
psi29a e1875d459a Merge branch 'boost-config-required' into 'master'
Modernise Boost CMake stuff

Closes #8100

See merge request OpenMW/openmw!4307
4 months ago
Mehdi Yousfi-Monod 20bd83b280 bumped Lua API version 4 months ago
Mads Buvik Sandvei 2faf7036f5 bump lua api revision 4 months ago
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.
4 months ago
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).
4 months ago
uramer d8cd0788e4 Merge branch 'madsbuvi-master-patch-56327' into 'master'
Update lua api revision

See merge request OpenMW/openmw!4320
5 months ago
Mads Buvik Sandvei fadcf5d255 Update lua api revision 5 months ago
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.
5 months ago
Dave Corley c90af583b2 FEAT(CMakeLists): Increment API revision 5 months ago
Evil Eye ee653eb2b8 Make mwscript return nil for records that don't have a script 6 months ago
psi29a ef0bb02def Merge branch 'master' into 'master'
An ability to specify attack type in controls.use value

See merge request OpenMW/openmw!4187
6 months ago
Max Yari 723c64a79b Lua API version increment 6 months ago
Jared Davenport 06b0f6b970 Update CMakeLists.txt 6 months ago
Jared Davenport 3a8bafd7b1 doesn't detect correct ffmpeg version for android 6 months ago
Jared Davenport fcb9fafd15 remove cmakefix.patch
for android this is an issue during the cmake process.
6 months ago
Bret Curtis 1ccf101a92 REQUIRED flag will get rid of need to have extra if check 7 months ago
Bret Curtis 1edcd80501 consolidate cmake documentation flow 7 months ago
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.
7 months ago
Bret Curtis 3c04e9f77e [#7016] Add additional docs to macos dmg and windows release 7 months ago
trav5 5d683f7b36 ESM::Dialogue Lua bindings: API_REVISION updated to 62 8 months ago
trav5 f121c0ea72 ESM::Dialogue Lua bindings: API_REVISION updated 8 months ago
psi29a 3980bb15cc Merge branch 'lua_controller_cursor' into 'master'
Add lua bindings for controller cursor mode

See merge request OpenMW/openmw!3623
8 months ago
Zackhasacat 55f4f6a5bf Update API_REVISION 8 months ago
Andrei Kortunov 1bb48bcef7 Treat editor icons as scalable 8 months ago
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
9 months ago
Andrei Kortunov 1ad9e5f9e8 Rework editor icons 9 months ago
AnyOldName3 901a17ab81 Make comments stop lying 9 months ago
AnyOldName3 ea029b06ea Remove unused define 9 months ago
Andrei Kortunov 8fecbb55ff Do not store 'location' tags in translation files 9 months ago
Evil Eye 4607722ce9 Increment API version 9 months ago
Andrei Kortunov 009ccca978 Modify sound API permissions 10 months ago
psi29a d746918563 Merge branch 'yaml_parse' into 'master'
Load YAML files via Lua

Closes #7590

See merge request OpenMW/openmw!3924
10 months ago
Andrei Kortunov 715efe892f Load YAML files via Lua (feature 7590) 10 months ago
AnyOldName3 7b89ca6bb2 Make CCache work for MSVC builds with debug symbols 10 months ago
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.
10 months ago
psi29a 231b5753e4 Merge branch 'launcher_help_version' into 'master'
Open matching version of documentation for Launcher Help

See merge request OpenMW/openmw!3909
10 months ago
Andrei Kortunov ddd0945645 Add a storage mode to drop section on game exit 10 months ago
uramer 86a82ae3f1 Open matching version of documentation for Launcher Help 10 months ago
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
10 months ago
Andrei Kortunov 7c4b42ab2a Add a Lua function to check if actor's death is finished 10 months ago
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.
10 months ago
psi29a 1280345296 Merge branch 'copy_qtbase' into 'master'
Copy qtbase translations

See merge request OpenMW/openmw!3840
11 months ago
Andrei Kortunov 9a7b9572fd Deploy base Qt translations when needed 11 months ago