mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

[VR Build] Rename VR client executable

Browse Source
pull/615/head
David Cernat 3 years ago
parent 339a196579
commit 71bea5fc00
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

18
CMakeLists.txt
Unescape Escape View File

@ -720,19 +720,19 @@ if (WIN32)
# TODO: properties and link targets should be copied from openmw to openmw_vr instead of duplicating every line # TODO: properties and link targets should be copied from openmw to openmw_vr instead of duplicating every line
if (USE_DEBUG_CONSOLE AND BUILD_OPENMW_VR) if (USE_DEBUG_CONSOLE AND BUILD_OPENMW_VR)
set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE") set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE") set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
set_target_properties(openmw_vr PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_CONSOLE>) set_target_properties(tes3mp_vr PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_CONSOLE>)
elseif (BUILD_OPENMW_VR) elseif (BUILD_OPENMW_VR)
# Turn off debug console, debug output will be written to visual studio output instead # Turn off debug console, debug output will be written to visual studio output instead
set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS") set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS") set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS")
endif() endif()
if (BUILD_OPENMW_VR) if (BUILD_OPENMW_VR)
# Release builds don't use the debug console # Release builds don't use the debug console
set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
set_target_properties(openmw_vr PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS") set_target_properties(tes3mp_vr PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
endif() endif()
# Play a bit with the warning levels # Play a bit with the warning levels
@ -809,9 +809,9 @@ if (WIN32)
if (BUILD_OPENMW_VR) if (BUILD_OPENMW_VR)
if (OPENMW_UNITY_BUILD) if (OPENMW_UNITY_BUILD)
set_target_properties(openmw_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj") set_target_properties(tes3mp_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
else() else()
set_target_properties(openmw_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}") set_target_properties(tes3mp_vr PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
endif() endif()
endif() endif()

18
apps/openmw/CMakeLists.txt
Unescape Escape View File

@ -328,7 +328,7 @@ endif()
if(BUILD_OPENMW_VR) if(BUILD_OPENMW_VR)
# Use of FetchContent to include the OpenXR SDK requires CMake 3.11 # Use of FetchContent to include the OpenXR SDK requires CMake 3.11
if(${CMAKE_VERSION} VERSION_LESS "3.11") if(${CMAKE_VERSION} VERSION_LESS "3.11")
message(FATAL_ERROR "Building openmw_vr requires CMake version 3.11 or later.") message(FATAL_ERROR "Building tes3mp_vr requires CMake version 3.11 or later.")
endif() endif()
# TODO: Openmw and openmw_vr should preferrably share game code as a static or shared library # TODO: Openmw and openmw_vr should preferrably share game code as a static or shared library
@ -343,7 +343,7 @@ if(BUILD_OPENMW_VR)
vranimation vrcamera vrenvironment vrframebuffer vrgui vrinputmanager vrinput vrlistbox vrmetamenu vrpointer vrsession vrtracking vrtypes vrutil vrviewer vrvirtualkeyboard vranimation vrcamera vrenvironment vrframebuffer vrgui vrinputmanager vrinput vrlistbox vrmetamenu vrpointer vrsession vrtracking vrtypes vrutil vrviewer vrvirtualkeyboard
) )
openmw_add_executable(openmw_vr openmw_add_executable(tes3mp_vr
${OPENMW_FILES} ${OPENMW_FILES}
${OPENMW_VR_FILES} ${OPENMW_VR_FILES}
${GAME} ${GAME_HEADER} ${GAME} ${GAME_HEADER}
@ -364,25 +364,25 @@ if(BUILD_OPENMW_VR)
) )
FetchContent_MakeAvailable(OpenXR) FetchContent_MakeAvailable(OpenXR)
target_link_libraries(openmw_vr openxr_loader) target_link_libraries(tes3mp_vr openxr_loader)
# Preprocessor variable used to control code paths to vr code # Preprocessor variable used to control code paths to vr code
if (WIN32) if (WIN32)
target_compile_options(openmw_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_GRAPHICS_API_D3D11 -DXR_USE_PLATFORM_WIN32) target_compile_options(tes3mp_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_GRAPHICS_API_D3D11 -DXR_USE_PLATFORM_WIN32)
elseif(UNIX) elseif(UNIX)
target_compile_options(openmw_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_PLATFORM_XLIB) target_compile_options(tes3mp_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_PLATFORM_XLIB)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
target_link_libraries(openmw_vr ${X11_LIBRARIES}) target_link_libraries(tes3mp_vr ${X11_LIBRARIES})
endif() endif()
target_link_libraries(openmw_vr ${OPENMW_LINK_TARGETS}) target_link_libraries(tes3mp_vr ${OPENMW_LINK_TARGETS})
if(APPLE) if(APPLE)
add_custom_command(TARGET openmw_vr add_custom_command(TARGET tes3mp_vr
POST_BUILD POST_BUILD
COMMAND cp "${OpenMW_BINARY_DIR}/resources/version" "${BUNDLE_RESOURCES_DIR}/resources") COMMAND cp "${OpenMW_BINARY_DIR}/resources/version" "${BUNDLE_RESOURCES_DIR}/resources")
endif(APPLE) endif(APPLE)
if (WIN32) if (WIN32)
INSTALL(TARGETS openmw_vr RUNTIME DESTINATION ".") INSTALL(TARGETS tes3mp_vr RUNTIME DESTINATION ".")
endif (WIN32) endif (WIN32)
endif() endif()

Write Preview
Loading…
Cancel
Save