mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-29 22:45:36 +00:00
use OPENMW_RESOURCES_ROOT instead
This commit is contained in:
parent
a9bf53d4ed
commit
9336626927
7 changed files with 13 additions and 13 deletions
|
@ -446,7 +446,7 @@ if (APPLE)
|
|||
endif (APPLE)
|
||||
|
||||
if (NOT APPLE) # this is modified for macOS use later in "apps/open[mw|cs]/CMakeLists.txt"
|
||||
set(OPENMW_BINARY_ROOT ${OpenMW_BINARY_DIR})
|
||||
set(OPENMW_RESOURCES_ROOT ${OpenMW_BINARY_DIR})
|
||||
endif ()
|
||||
|
||||
add_subdirectory(files/)
|
||||
|
|
|
@ -183,7 +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_BINARY_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
|
||||
set(OPENMW_RESOURCES_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
|
||||
|
||||
add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
|
||||
|
||||
|
|
|
@ -179,7 +179,7 @@ endif()
|
|||
if(APPLE)
|
||||
set(BUNDLE_RESOURCES_DIR "${APP_BUNDLE_DIR}/Contents/Resources")
|
||||
|
||||
set(OPENMW_BINARY_ROOT ${BUNDLE_RESOURCES_DIR})
|
||||
set(OPENMW_RESOURCES_ROOT ${BUNDLE_RESOURCES_DIR})
|
||||
|
||||
add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
if (NOT DEFINED OPENMW_BINARY_ROOT)
|
||||
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)
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "builtin.omwscripts")
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_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")
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "openmw_aux/util.lua")
|
||||
|
||||
set(LUA_SCRIPTS_FILES
|
||||
scripts/omw/camera.lua
|
||||
|
@ -17,4 +17,4 @@ set(LUA_SCRIPTS_FILES
|
|||
)
|
||||
|
||||
set(DDIRRELATIVE resources/vfs/scripts/omw)
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
if (NOT DEFINED OPENMW_BINARY_ROOT)
|
||||
if (NOT DEFINED OPENMW_RESOURCES_ROOT)
|
||||
return()
|
||||
endif()
|
||||
|
||||
|
@ -97,4 +97,4 @@ set(MYGUI_FILES
|
|||
)
|
||||
|
||||
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
if (NOT DEFINED OPENMW_BINARY_ROOT)
|
||||
if (NOT DEFINED OPENMW_RESOURCES_ROOT)
|
||||
return()
|
||||
endif()
|
||||
|
||||
|
@ -42,4 +42,4 @@ set(SHADER_FILES
|
|||
softparticles.glsl
|
||||
)
|
||||
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
if (NOT DEFINED OPENMW_BINARY_ROOT)
|
||||
if (NOT DEFINED OPENMW_RESOURCES_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_BINARY_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
|
||||
copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
|
||||
|
|
Loading…
Reference in a new issue