dropping dependencies from networking to script-engine by moving EntityScriptClient and LocationScriptingInterface

This commit is contained in:
Heather Anderson 2021-08-31 20:43:22 -07:00 committed by ksuprynowicz
parent 7964f06990
commit 45ef458af4
6 changed files with 13 additions and 15 deletions

View file

@ -1,7 +1,6 @@
set(TARGET_NAME networking) set(TARGET_NAME networking)
setup_hifi_library(Network WebSockets) setup_hifi_library(Network WebSockets)
link_hifi_libraries(shared platform) link_hifi_libraries(shared platform)
include_hifi_library_headers(script-engine)
target_openssl() target_openssl()
target_tbb() target_tbb()

View file

@ -1,6 +1,6 @@
#include "EntityScriptClient.h" #include "EntityScriptClient.h"
#include "NodeList.h" #include <NodeList.h>
#include "NetworkLogging.h" #include <NetworkLogging.h>
#include "EntityScriptUtils.h" #include "EntityScriptUtils.h"
#include <QThread> #include <QThread>

View file

@ -1,6 +1,6 @@
// //
// EntityScriptClient.h // EntityScriptClient.h
// libraries/networking/src // libraries/script-engine/src
// //
// Created by Ryan Huffman on 2017/01/13 // Created by Ryan Huffman on 2017/01/13
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
@ -14,10 +14,10 @@
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include "ClientServerUtils.h" #include <ClientServerUtils.h>
#include "LimitedNodeList.h" #include <LimitedNodeList.h>
#include "ReceivedMessage.h" #include <ReceivedMessage.h>
#include "AssetUtils.h" #include <AssetUtils.h>
#include "EntityScriptUtils.h" #include "EntityScriptUtils.h"
#include <DependencyManager.h> #include <DependencyManager.h>

View file

@ -1,6 +1,6 @@
// //
// LocationScriptingInterface.cpp // LocationScriptingInterface.cpp
// libraries/networking/src // libraries/script-engine/src
// //
// Created by Ryan Huffman on 4/29/14. // Created by Ryan Huffman on 4/29/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
@ -11,10 +11,10 @@
#include "LocationScriptingInterface.h" #include "LocationScriptingInterface.h"
#include "AddressManager.h" #include <AddressManager.h>
#include <ScriptContext.h> #include "ScriptContext.h"
#include <ScriptEngine.h> #include "ScriptEngine.h"
#include <ScriptValue.h> #include "ScriptValue.h"
LocationScriptingInterface* LocationScriptingInterface::getInstance() { LocationScriptingInterface* LocationScriptingInterface::getInstance() {
static LocationScriptingInterface sharedInstance; static LocationScriptingInterface sharedInstance;

View file

@ -1,6 +1,6 @@
// //
// LocationScriptingInterface.h // LocationScriptingInterface.h
// libraries/networking/src // libraries/script-engine/src
// //
// Created by Ryan Huffman on 4/29/14. // Created by Ryan Huffman on 4/29/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.

View file

@ -17,6 +17,5 @@ if (NOT APPLE)
endif() endif()
setup_hifi_plugin(Qml) setup_hifi_plugin(Qml)
link_hifi_libraries(shared controllers ui plugins input-plugins) link_hifi_libraries(shared controllers ui plugins input-plugins)
include_hifi_library_headers(script-engine)
target_sdl2() target_sdl2()
endif() endif()