fix build errors

This commit is contained in:
SamGondelman 2018-02-20 13:56:06 -08:00
parent 5791ca4c51
commit 4f0f6709c1
4 changed files with 3 additions and 4 deletions

View file

@ -38,6 +38,7 @@ scriptable::ScriptableModelBase::~ScriptableModelBase() {
meshes.clear();
//qCDebug(graphics_scripting) << "//~ScriptableModelBase" << this;
}
void scriptable::ScriptableModelBase::append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata) {
//qCDebug(graphics_scripting) << "+ APPEND WeakMeshPointer" << mesh.lock().get();
meshes << ScriptableMeshBase{ provider, this, mesh, metadata };

View file

@ -16,7 +16,6 @@ namespace scriptable {
ScriptableModel(const ScriptableModel& other) : ScriptableModelBase(other) {}
ScriptableModel(const ScriptableModelBase& other) : ScriptableModelBase(other) {}
ScriptableModel& operator=(const ScriptableModelBase& view) { ScriptableModelBase::operator=(view); return *this; }
//virtual ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
Q_INVOKABLE scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
// TODO: in future accessors for these could go here

View file

@ -3,11 +3,10 @@ AUTOSCRIBE_SHADER_LIB(gpu graphics render)
# pull in the resources.qrc file
qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
setup_hifi_library(Widgets OpenGL Network Qml Quick Script)
link_hifi_libraries(shared ktx gpu graphics model-networking render animation fbx image procedural)
link_hifi_libraries(shared ktx gpu graphics graphics-scripting model-networking render animation fbx image procedural)
include_hifi_library_headers(networking)
include_hifi_library_headers(octree)
include_hifi_library_headers(audio)
include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h
if (NOT ANDROID)
target_nsight()

View file

@ -16,7 +16,7 @@ link_hifi_libraries(
shared networking animation
ktx image octree gl gpu
render render-utils
graphics fbx model-networking
graphics fbx model-networking graphics-scripting
entities entities-renderer audio avatars script-engine
physics procedural midi ui
${PLATFORM_GL_BACKEND}