From f350701eacbcf74e4739938fdd51a302e65edb4a Mon Sep 17 00:00:00 2001 From: milad Date: Wed, 4 Dec 2019 08:44:56 -0800 Subject: [PATCH] fixed resouce path and removed unused include --- interface/CMakeLists.txt | 4 ++-- interface/src/scripting/ScreenshareScriptingInterface.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 2c1cb9f8c4..4791a9a827 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -323,7 +323,7 @@ if (APPLE) COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_SOURCE_DIR}/scripts" "${RESOURCES_DEV_DIR}/scripts" - + # copy screenshare app to the resource folder COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/../screenshare/hifi-screenshare-darwin-x64/hifi-screenshare.app" "${RESOURCES_DEV_DIR}/hifi-screenshare.app" @@ -351,7 +351,7 @@ if (APPLE) COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${PROJECT_SOURCE_DIR}/resources/serverless/redirect.json" "${RESOURCES_DEV_DIR}/serverless/redirect.json" - ) + ) # call the fixup_interface macro to add required bundling commands for installation fixup_interface() diff --git a/interface/src/scripting/ScreenshareScriptingInterface.h b/interface/src/scripting/ScreenshareScriptingInterface.h index fc0486f41f..3b4618c630 100644 --- a/interface/src/scripting/ScreenshareScriptingInterface.h +++ b/interface/src/scripting/ScreenshareScriptingInterface.h @@ -14,7 +14,6 @@ #include #include -#include #include #include @@ -46,7 +45,7 @@ private: #ifdef Q_OS_WIN const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-win32-x64/hifi-screenshare.exe" }; #elif defined(Q_OS_MAC) - const QString SCREENSHARE_EXE_PATH{ PathUtils::resourcesPath() + "hifi-screenshare.app" }; + const QString SCREENSHARE_EXE_PATH{ PathUtils::resourcesPath() + "/../hifi-screenshare.app" }; #else // This path won't exist on other platforms, so the Screenshare Scripting Interface will exit early when invoked. const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-other-os/hifi-screenshare" }; @@ -55,7 +54,7 @@ private: #ifdef Q_OS_WIN const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare.exe" }; #elif defined(Q_OS_MAC) - const QString SCREENSHARE_EXE_PATH{ PathUtils::resourcesPath() + "hifi-screenshare.app" }; + const QString SCREENSHARE_EXE_PATH{ PathUtils::resourcesPath() + "/../hifi-screenshare.app" }; #else // This path won't exist on other platforms, so the Screenshare Scripting Interface will exit early when invoked. const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare" };