compiles on android... finally

zilongshanren · Jun 7, 2016 · 6ee0a3c · 6ee0a3c
1 parent fb728da
commit 6ee0a3c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 179 deletions.
diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj
diff --git a/cocos/Android.mk b/cocos/Android.mk
@@ -190,19 +190,10 @@ renderer/CCVertexIndexData.cpp \
 renderer/ccGLStateCache.cpp \
 renderer/CCFrameBuffer.cpp \
 renderer/ccShaders.cpp \
-vr/CCVRCardboardHeadTracker.cpp \
-vr/CCVRCardboardRenderer.cpp \
-vr/CCVRDeepoonHeadTracker.cpp \
-vr/CCVRDeepoonRenderer.cpp \
 vr/CCVRDistortion.cpp \
 vr/CCVRDistortionMesh.cpp \
-vr/CCVRGearVRHeadTracker.cpp \
-vr/CCVRGearVRRenderer.cpp \
 vr/CCVRGenericRenderer.cpp \
-vr/CCVRGvrHeadTracker.cpp \
-vr/CCVRGvrRenderer.cpp \
-vr/CCVROculusHeadTracker.cpp \
-vr/CCVROculusRenderer.cpp \
+vr/CCVRGenericHeadTracker.cpp \
 deprecated/CCArray.cpp \
 deprecated/CCDeprecated.cpp \
 deprecated/CCDictionary.cpp \
@@ -227,7 +218,6 @@ navmesh/CCNavMeshAgent.cpp \
 navmesh/CCNavMeshDebugDraw.cpp \
 navmesh/CCNavMeshObstacle.cpp \
 navmesh/CCNavMeshUtils.cpp \
-vr/CCVRGenericRenderer.cpp \
 ../external/ConvertUTF/ConvertUTFWrapper.cpp \
 ../external/ConvertUTF/ConvertUTF.c \
 ../external/tinyxml2/tinyxml2.cpp \

diff --git a/cocos/vr/CCVRDistortion.cpp b/cocos/vr/CCVRDistortion.cpp
@@ -24,6 +24,7 @@
  ****************************************************************************/
 
 #include "CCVRDistortion.h"
+#include <math.h>
 
 NS_CC_BEGIN
 

diff --git a/cocos/vr/CCVRDistortionMesh.cpp b/cocos/vr/CCVRDistortionMesh.cpp
@@ -26,6 +26,7 @@
 #include "vr/CCVRDistortionMesh.h"
 #include "vr/CCVRDistortion.h"
 #include "math/Vec2.h"
+#include "platform/CCGL.h"
 
 NS_CC_BEGIN
 

diff --git a/cocos/vr/CCVRGenericHeadTracker.mm → cocos/vr/CCVRGenericHeadTracker.cpp b/cocos/vr/CCVRGenericHeadTracker.mm → cocos/vr/CCVRGenericHeadTracker.cpp
@@ -23,6 +23,10 @@ of this software and associated documentation files (the "Software"), to deal
  THE SOFTWARE.
  ****************************************************************************/
 
+// IMPORTANT
+// For iOS/Mac, this file is treated as an "Objective-C++" file.
+// To change this behvior, use the File Inspector from Xcode
+
 #include "vr/CCVRGenericHeadTracker.h"
 #include "platform/CCPlatformMacros.h"
 

diff --git a/cocos/vr/CMakeLists.txt b/cocos/vr/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+set(COCOS_VR_SRC
+    vr/CCVRDistortion.cpp
+    vr/CCVRDistortionMesh.cpp
+    vr/CCVRGenericRenderer.cpp
+    vr/CCVRGenericHeadTracker.cpp
+)