Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp

Browse source
This commit is contained in:
milad 2019-10-31 09:37:08 -07:00
commit 114b9250bf
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,9 @@ class ScreenshareScriptingInterface : public QObject, public Dependency {
public: public:
ScreenshareScriptingInterface(); ScreenshareScriptingInterface();
Q_INVOKABLE void startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey);
private:
#if DEV_BUILD #if DEV_BUILD
#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" };
@ -30,8 +33,6 @@ public:
const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare" }; const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare" };
#endif #endif
#endif #endif
Q_INVOKABLE void startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey);
}; };
#endif // hifi_ScreenshareScriptingInterface_h #endif // hifi_ScreenshareScriptingInterface_h

14
screenshare/CMakeLists.txt
View file

@ -32,6 +32,14 @@ elseif (APPLE)
) )
endif() endif()
# Don't build the Screenshare Electron app when building the `ALL_BUILD` target. if (PR_BUILD)
# Don't build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio. # DO build the Screenshare Electron app when building the `ALL_BUILD` target.
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE) # DO build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio.
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE)
set_target_properties(${TARGET_NAME}-npm-install PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE)
else ()
# DO NOT build the Screenshare Electron app when building the `ALL_BUILD` target.
# DO NOT build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio.
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)
set_target_properties(${TARGET_NAME}-npm-install PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)
endif ()