diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d28435f9..8c119c934 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ option(BUILD_ESSIMPORTER "Build ESS (Morrowind save game) importer" ON) option(BUILD_BSATOOL "Build BSA extractor" ON) option(BUILD_ESMTOOL "Build ESM inspector" ON) option(BUILD_NIFTEST "Build nif file tester" ON) -option(BUILD_DOCS "Build documentation." OFF) +option(BUILD_DOCS "Build documentation." OFF ) option(BUILD_VR_OPENXR "Build VR support using OpenXR" on) option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF) option(BUILD_UNITTESTS "Enable Unittests with Google C++ Unittest" OFF) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 719b5c336..d96d7b99e 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -215,7 +215,7 @@ if (ANDROID) ${OSG_PLUGINS} -Wl,--no-whole-archive ) - target_link_libraries(openmw + target_link_libraries(openmw EGL android log @@ -229,18 +229,18 @@ if (ANDROID) endif (ANDROID) if (USE_SYSTEM_TINYXML) - target_link_libraries(openmw ${TinyXML_LIBRARIES}) + target_link_libraries(openmw ${TinyXML_LIBRARIES}) target_link_libraries(openmw_vr ${TinyXML_LIBRARIES}) endif() if (NOT UNIX) -target_link_libraries(openmw ${SDL2MAIN_LIBRARY}) +target_link_libraries(openmw ${SDL2MAIN_LIBRARY}) target_link_libraries(openmw_vr ${SDL2MAIN_LIBRARY}) endif() # Fix for not visible pthreads functions for linker with glibc 2.15 if (UNIX AND NOT APPLE) -target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(openmw_vr ${CMAKE_THREAD_LIBS_INIT}) endif() @@ -266,20 +266,20 @@ if(APPLE) find_library(COCOA_FRAMEWORK Cocoa) find_library(IOKIT_FRAMEWORK IOKit) - target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK}) + target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK}) target_link_libraries(openmw_vr ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK}) if (FFmpeg_FOUND) find_library(COREVIDEO_FRAMEWORK CoreVideo) find_library(VDA_FRAMEWORK VideoDecodeAcceleration) - target_link_libraries(openmw z ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK}) + target_link_libraries(openmw z ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK}) target_link_libraries(openmw_vr z ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK}) endif() endif(APPLE) if (BUILD_WITH_CODE_COVERAGE) add_definitions (--coverage) - target_link_libraries(openmw gcov) + target_link_libraries(openmw gcov) target_link_libraries(openmw_vr gcov) endif() @@ -291,6 +291,6 @@ if (MSVC) endif (MSVC) if (WIN32) - INSTALL(TARGETS openmw RUNTIME DESTINATION ".") + INSTALL(TARGETS openmw RUNTIME DESTINATION ".") INSTALL(TARGETS openmw_vr RUNTIME DESTINATION ".") endif (WIN32) diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp index 1e8eab5a9..8bdf9e52d 100644 --- a/apps/openmw/mwrender/renderingmanager.hpp +++ b/apps/openmw/mwrender/renderingmanager.hpp @@ -167,7 +167,7 @@ namespace MWRender bool screenshot360(osg::Image* image, std::string settingStr); RayResult castRay(const osg::Vec3f& origin, const osg::Vec3f& dest, bool ignorePlayer, bool ignoreActors=false); - + /// Cast a ray from a node in the scene graph RayResult castRay(const osg::Transform* source, float maxDistance, bool ignorePlayer, bool ignoreActors=false);