Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Install the local openmw.cfg template on Windows

Browse source 
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.
This commit is contained in:
AnyOldName3 2024-10-14 23:05:52 +01:00
parent 4ac1b13871
commit 62199c2dad
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -542,11 +542,16 @@ pack_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml
"${OpenMW_BINARY_DIR}" "openmw.appdata.xml") "${OpenMW_BINARY_DIR}" "openmw.appdata.xml")
if (NOT APPLE) if (NOT WIN32 AND NOT APPLE)
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
"${OpenMW_BINARY_DIR}" "openmw.cfg") "${OpenMW_BINARY_DIR}" "openmw.cfg")
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
"${OpenMW_BINARY_DIR}" "openmw.cfg.install") "${OpenMW_BINARY_DIR}" "openmw.cfg.install")
elseif (WIN32)
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
"${OpenMW_BINARY_DIR}" "openmw.cfg")
configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
"${OpenMW_BINARY_DIR}" "openmw.cfg.install")
else () else ()
configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
"${OpenMW_BINARY_DIR}/openmw.cfg") "${OpenMW_BINARY_DIR}/openmw.cfg")