Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 11:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed resouce path and removed unused include

Browse source
This commit is contained in:
milad 2019-12-04 08:44:56 -08:00
parent 8b45710aea
commit f350701eac
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/CMakeLists.txt
View file

@ -323,7 +323,7 @@ if (APPLE)
COMMAND "${CMAKE_COMMAND}" -E copy_directory COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${CMAKE_SOURCE_DIR}/scripts" "${CMAKE_SOURCE_DIR}/scripts"
"${RESOURCES_DEV_DIR}/scripts" "${RESOURCES_DEV_DIR}/scripts"
# copy screenshare app to the resource folder
COMMAND "${CMAKE_COMMAND}" -E copy_directory COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${CMAKE_CURRENT_BINARY_DIR}/../screenshare/hifi-screenshare-darwin-x64/hifi-screenshare.app" "${CMAKE_CURRENT_BINARY_DIR}/../screenshare/hifi-screenshare-darwin-x64/hifi-screenshare.app"
"${RESOURCES_DEV_DIR}/hifi-screenshare.app" "${RESOURCES_DEV_DIR}/hifi-screenshare.app"
@ -351,7 +351,7 @@ if (APPLE)
COMMAND "${CMAKE_COMMAND}" -E copy_if_different COMMAND "${CMAKE_COMMAND}" -E copy_if_different
"${PROJECT_SOURCE_DIR}/resources/serverless/redirect.json" "${PROJECT_SOURCE_DIR}/resources/serverless/redirect.json"
"${RESOURCES_DEV_DIR}/serverless/redirect.json" "${RESOURCES_DEV_DIR}/serverless/redirect.json"
) )
# call the fixup_interface macro to add required bundling commands for installation # call the fixup_interface macro to add required bundling commands for installation
fixup_interface() fixup_interface()

5
interface/src/scripting/ScreenshareScriptingInterface.h
View file

@ -14,7 +14,6 @@
#include <QObject> #include <QObject>
#include <QProcess> #include <QProcess>
#include <QUrl>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QNetworkReply> #include <QNetworkReply>
@ -46,7 +45,7 @@ private:
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-win32-x64/hifi-screenshare.exe" }; const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-win32-x64/hifi-screenshare.exe" };
#elif defined(Q_OS_MAC) #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 #else
// This path won't exist on other platforms, so the Screenshare Scripting Interface will exit early when invoked. // 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" }; const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-other-os/hifi-screenshare" };
@ -55,7 +54,7 @@ private:
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare.exe" }; const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare.exe" };
#elif defined(Q_OS_MAC) #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 #else
// This path won't exist on other platforms, so the Screenshare Scripting Interface will exit early when invoked. // 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" }; const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare" };