mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-16 03:40:16 +00:00
Code Issues Projects Releases Wiki Activity

modified builtin_scripts to be macOS aware; simplified things as the SHADER and MYGUI dir were just pointing to the OpenMW_BINARY_DIR anyway, so removing the code duplication

Browse Source
This commit is contained in:
Bret Curtis 2021-12-07 11:31:41 +01:00
parent 48573b1278
commit a9bf53d4ed
7 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -445,9 +445,8 @@ if (APPLE)
"${APP_BUNDLE_DIR}/Contents/Resources/OpenMW.icns" COPYONLY)
endif (APPLE)
if (NOT APPLE)
set(OPENMW_MYGUI_FILES_ROOT ${OpenMW_BINARY_DIR})
set(OPENMW_SHADERS_ROOT ${OpenMW_BINARY_DIR})
if (NOT APPLE) # this is modified for macOS use later in "apps/open[mw|cs]/CMakeLists.txt"
set(OPENMW_BINARY_ROOT ${OpenMW_BINARY_DIR})
endif ()
add_subdirectory(files/)

3
apps/opencs/CMakeLists.txt
View File

@ -183,8 +183,7 @@ if(APPLE)
set(OPENCS_BUNDLE_NAME "OpenMW-CS")
set(OPENCS_BUNDLE_RESOURCES_DIR "${OpenMW_BINARY_DIR}/${OPENCS_BUNDLE_NAME}.app/Contents/Resources")
set(OPENMW_MYGUI_FILES_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
set(OPENMW_SHADERS_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
set(OPENMW_BINARY_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)

3
apps/openmw/CMakeLists.txt
View File

@ -179,8 +179,7 @@ endif()
if(APPLE)
set(BUNDLE_RESOURCES_DIR "${APP_BUNDLE_DIR}/Contents/Resources")
set(OPENMW_MYGUI_FILES_ROOT ${BUNDLE_RESOURCES_DIR})
set(OPENMW_SHADERS_ROOT ${BUNDLE_RESOURCES_DIR})
set(OPENMW_BINARY_ROOT ${BUNDLE_RESOURCES_DIR})
add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)

24
files/builtin_scripts/CMakeLists.txt
View File

@ -1,8 +1,20 @@
file(GLOB_RECURSE BUILTIN_SCRIPTS LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS "*")
if (NOT DEFINED OPENMW_BINARY_ROOT)
return()
endif()
foreach (f ${BUILTIN_SCRIPTS})
if (NOT ("CMakeLists.txt" STREQUAL "${f}"))
copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OpenMW_BINARY_DIR}" "resources/vfs/${f}")
endif()
endforeach (f)
# Copy resource files into the build directory
set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
set(DDIRRELATIVE resources/vfs)
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "builtin.omwscripts")
set(DDIRRELATIVE resources/vfs/openmw_aux)
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "openmw_aux/util.lua")
set(LUA_SCRIPTS_FILES
scripts/omw/camera.lua
scripts/omw/head_bobbing.lua
scripts/omw/third_person.lua
)
set(DDIRRELATIVE resources/vfs/scripts/omw)
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")

4
files/mygui/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if (NOT DEFINED OPENMW_MYGUI_FILES_ROOT)
if (NOT DEFINED OPENMW_BINARY_ROOT)
return()
endif()
@ -97,4 +97,4 @@ set(MYGUI_FILES
)
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_MYGUI_FILES_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")

4
files/shaders/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if (NOT DEFINED OPENMW_SHADERS_ROOT)
if (NOT DEFINED OPENMW_BINARY_ROOT)
return()
endif()
@ -42,4 +42,4 @@ set(SHADER_FILES
softparticles.glsl
)
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")

4
files/vfs/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if (NOT DEFINED OPENMW_MYGUI_FILES_ROOT)
if (NOT DEFINED OPENMW_BINARY_ROOT)
return()
endif()
@ -15,4 +15,4 @@ set(TEXTURE_FILES
textures/omw_menu_scroll_center_v.dds
)
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_MYGUI_FILES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")