Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 09:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweaks for iOS compatibility

Browse source
This commit is contained in:
Stephen Birarda 2013-07-24 12:34:32 -07:00
parent 055c644736
commit 7134d13001
6 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-server/CMakeLists.txt
View file

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

7
hifi.podspec
View file

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

2
interface/src/avatar/AvatarVoxelSystem.h
View file

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

2
libraries/avatars/src/Agent.cpp
View file

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

3
libraries/avatars/src/AvatarData.h
View file

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

5
libraries/shared/src/NodeData.h
View file

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