Merge branch 'remove_data' into 'master'

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

See merge request OpenMW/openmw!1579

CHANGELOG.md

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

CMakeLists.txt

@@ -181,7 +181,6 @@ endif()
 
 # Set up common paths
 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")
 elseif(UNIX)
     # Paths
@@ -199,10 +198,8 @@ elseif(UNIX)
     ENDIF()
     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")
 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")
 endif(APPLE)
 

files/openmw.cfg

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

files/openmw.cfg.local

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