tweaks for iOS compatibility

assignment-server/CMakeLists.txt

@@ -6,7 +6,7 @@ set(ROOT_DIR ..)
 set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
 
 include(${MACRO_DIR}/SetupHifiProject.cmake)
-setup_hifi_project(${TARGET_NAME} FALSE)
+setup_hifi_project(${TARGET_NAME} TRUE)
 
 # link in the shared library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)

hifi.podspec

@@ -36,7 +36,6 @@ Pod::Spec.new do |s|
   
   s.subspec "shared" do |sp|
     sp.source_files = "libraries/shared/src"
-    sp.public_header_files = "librares/shared/src"
     sp.exclude_files = "libraries/shared/src/UrlReader.*"
     sp.dependency 'glm'
     sp.xcconfig = { 'CLANG_CXX_LIBRARY' => "libc++" }
@@ -44,7 +43,11 @@ Pod::Spec.new do |s|
   
   s.subspec "audio" do |sp|
     sp.source_files = "libraries/audio/src"
-    sp.public_header_files = "libraries/audio/src"
+    sp.dependency 'glm'
+  end
+  
+  s.subspec "avatars" do |sp|
+    sp.source_files = "libraries/avatar/src"
     sp.dependency 'glm'
   end
 

interface/src/avatar/AvatarVoxelSystem.h

@@ -21,7 +21,7 @@ class QNetworkReply;
 
 class Avatar;
 
-class AvatarVoxelSystem : public QObject, public VoxelSystem {
+class AvatarVoxelSystem : public VoxelSystem {
     Q_OBJECT
 
 public:

libraries/avatars/src/Agent.cpp

@@ -9,7 +9,7 @@
 #import <QtScript/QScriptEngine>
 #import <QtNetwork/QtNetwork>
 
-#include <AvatarData.h>
+#include "AvatarData.h"
 
 #include "Agent.h"
 

libraries/avatars/src/AvatarData.h

@@ -16,6 +16,8 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 
+#include <QtCore/QObject>
+
 #include <NodeData.h>
 #include "HeadData.h"
 #include "HandData.h"
@@ -39,6 +41,7 @@ enum KeyState
 class JointData;
 
 class AvatarData : public NodeData {
+  Q_OBJECT
 public:
     AvatarData(Node* owningNode = NULL);
     ~AvatarData();

libraries/shared/src/NodeData.h

@@ -9,9 +9,12 @@
 #ifndef hifi_NodeData_h
 #define hifi_NodeData_h
 
+#include <QtCore/QObject>
+
 class Node;
 
-class NodeData {
+class NodeData : public QObject {
+  Q_OBJECT
 public:
     NodeData(Node* owningNode);