mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 00:32:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'remove_data' into 'master'

Browse Source 
Remove predefined data paths `data="?global?data"`, `data=./data` (#6564)

See merge request OpenMW/openmw!1579
This commit is contained in:
uramer 2022-01-27 22:41:59 +00:00
commit 0b5f10e41b
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -132,6 +132,7 @@
Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
Task #6264: Remove the old classes in animation.cpp Task #6264: Remove the old classes in animation.cpp
Task #6553: Simplify interpreter instruction registration Task #6553: Simplify interpreter instruction registration
Task #6564: Remove predefined data paths `data="?global?data"`, `data=./data`
0.47.0 0.47.0
------ ------

3
CMakeLists.txt
View File

@ -181,7 +181,6 @@ endif()
# Set up common paths # Set up common paths
if (APPLE) if (APPLE)
set(MORROWIND_DATA_FILES "./data" CACHE PATH "location of Morrowind data files")
set(OPENMW_RESOURCE_FILES "../Resources/resources" CACHE PATH "location of OpenMW resources files") set(OPENMW_RESOURCE_FILES "../Resources/resources" CACHE PATH "location of OpenMW resources files")
elseif(UNIX) elseif(UNIX)
# Paths # Paths
@ -199,10 +198,8 @@ elseif(UNIX)
ENDIF() ENDIF()
SET(SYSCONFDIR "${GLOBAL_CONFIG_PATH}/openmw" CACHE PATH "Set config dir") SET(SYSCONFDIR "${GLOBAL_CONFIG_PATH}/openmw" CACHE PATH "Set config dir")
set(MORROWIND_DATA_FILES "${DATADIR}/data" CACHE PATH "location of Morrowind data files")
set(OPENMW_RESOURCE_FILES "${DATADIR}/resources" CACHE PATH "location of OpenMW resources files") set(OPENMW_RESOURCE_FILES "${DATADIR}/resources" CACHE PATH "location of OpenMW resources files")
else() else()
set(MORROWIND_DATA_FILES "data" CACHE PATH "location of Morrowind data files")
set(OPENMW_RESOURCE_FILES "resources" CACHE PATH "location of OpenMW resources files") set(OPENMW_RESOURCE_FILES "resources" CACHE PATH "location of OpenMW resources files")
endif(APPLE) endif(APPLE)

1
files/openmw.cfg
View File

@ -3,7 +3,6 @@
# (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html) # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
content=builtin.omwscripts content=builtin.omwscripts
data=${MORROWIND_DATA_FILES}
data-local="?userdata?data" data-local="?userdata?data"
resources=${OPENMW_RESOURCE_FILES} resources=${OPENMW_RESOURCE_FILES}
script-blacklist=Museum script-blacklist=Museum

2
files/openmw.cfg.local
View File

@ -3,8 +3,6 @@
# (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html) # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
content=builtin.omwscripts content=builtin.omwscripts
data="?global?data"
data=./data
data-local="?userdata?data" data-local="?userdata?data"
resources=./resources resources=./resources
script-blacklist=Museum script-blacklist=Museum