Merge files/builtin_scripts and files/vfs into one dir

files/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_subdirectory(mygui)
 add_subdirectory(shaders)
-add_subdirectory(vfs)
+add_subdirectory(data)
-add_subdirectory(builtin_scripts)
 add_subdirectory(lua_api)

files/data/CMakeLists.txt

@@ -2,14 +2,24 @@ if (NOT DEFINED OPENMW_RESOURCES_ROOT)
     return()
 endif()
 
-set(LUA_BUILTIN_FILES
+set(BUILTIN_DATA_FILES
-    builtin.omwscripts
+    textures/omw_menu_scroll_down.dds
+    textures/omw_menu_scroll_up.dds
+    textures/omw_menu_scroll_left.dds
+    textures/omw_menu_scroll_right.dds
+    textures/omw_menu_scroll_center_h.dds
+    textures/omw_menu_scroll_center_v.dds
+
+    l10n/Calendar/en.yaml
+    l10n/Interface/en.yaml
 
     openmw_aux/util.lua
     openmw_aux/time.lua
     openmw_aux/calendar.lua
     openmw_aux/ui.lua
 
+    builtin.omwscripts
+
     scripts/omw/ai.lua
     scripts/omw/camera.lua
     scripts/omw/head_bobbing.lua
@@ -22,10 +32,6 @@ set(LUA_BUILTIN_FILES
     scripts/omw/settings/common.lua
     scripts/omw/settings/render.lua
     scripts/omw/settings/renderers.lua
-
-    l10n/Calendar/en.yaml
-    l10n/Interface/en.yaml
-
     scripts/omw/mwui/constants.lua
     scripts/omw/mwui/borders.lua
     scripts/omw/mwui/filters.lua
@@ -33,8 +39,11 @@ set(LUA_BUILTIN_FILES
     scripts/omw/mwui/textEdit.lua
     scripts/omw/mwui/space.lua
     scripts/omw/mwui/init.lua
+
+    shaders/main.omwfx
+    shaders/displaydepth.omwfx
 )
 
-foreach (f ${LUA_BUILTIN_FILES})
+foreach (f ${BUILTIN_DATA_FILES})
     copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}")
 endforeach (f)

files/vfs/CMakeLists.txt

@@ -1,25 +0,0 @@
-if (NOT DEFINED OPENMW_RESOURCES_ROOT)
-    return()
-endif()
-
-# Copy resource files into the build directory
-set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DDIRRELATIVE resources/vfs/textures)
-set(DDIRRELATIVE_SHADERS resources/vfs/shaders)
-
-set(TEXTURE_FILES
-    textures/omw_menu_scroll_down.dds
-    textures/omw_menu_scroll_up.dds
-    textures/omw_menu_scroll_left.dds
-    textures/omw_menu_scroll_right.dds
-    textures/omw_menu_scroll_center_h.dds
-    textures/omw_menu_scroll_center_v.dds
-)
-
-set(SHADER_FILES
-    shaders/main.omwfx
-    shaders/displaydepth.omwfx
-)
-
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE_SHADERS} "${SHADER_FILES}")