move interface/entities to libraries/entities-renderer

interface/CMakeLists.txt

@@ -107,7 +107,8 @@ endif()
 add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
 
 # link required hifi libraries
-link_hifi_libraries(shared octree voxels gpu fbx metavoxels networking entities avatars audio animation script-engine physics render-utils)
+link_hifi_libraries(shared octree voxels gpu fbx metavoxels networking entities avatars audio animation script-engine physics 
+                    render-utils entities-renderer)
 
 # find any optional and required libraries
 find_package(ZLIB REQUIRED)

interface/src/Application.h

@@ -36,6 +36,7 @@
 #include <AbstractViewStateInterface.h>
 #include <EntityCollisionSystem.h>
 #include <EntityEditPacketSender.h>
+#include <EntityTreeRenderer.h>
 #include <GeometryCache.h>
 #include <NetworkPacket.h>
 #include <NodeList.h>
@@ -62,7 +63,6 @@
 #include "avatar/MyAvatar.h"
 #include "devices/PrioVR.h"
 #include "devices/SixenseManager.h"
-#include "entities/EntityTreeRenderer.h"
 #include "scripting/ControllerScriptingInterface.h"
 #include "ui/BandwidthDialog.h"
 #include "ui/BandwidthMeter.h"

libraries/entities-renderer/CMakeLists.txt

@@ -0,0 +1,37 @@
+set(TARGET_NAME entities-renderer)
+
+# use setup_hifi_library macro to setup our project and link appropriate Qt modules
+setup_hifi_library(Widgets OpenGL Network Script)
+
+include_glm()
+
+link_hifi_libraries(shared gpu)
+if (APPLE)
+  # link in required OS X frameworks and include the right GL headers
+  find_library(OpenGL OpenGL)
+
+  #target_link_libraries(${TARGET_NAME} ${OpenGL})
+    
+else (APPLE)
+  find_package(OpenGL REQUIRED)
+  
+  if (${OPENGL_INCLUDE_DIR})
+    include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
+  endif ()
+  
+  # link target to external libraries
+  if (WIN32)
+    find_package(GLEW REQUIRED)
+    include_directories(${GLEW_INCLUDE_DIRS})
+
+    find_package(GLUT REQUIRED)
+    include_directories(SYSTEM "${GLUT_INCLUDE_DIRS}")
+
+    # we're using static GLEW, so define GLEW_STATIC
+    add_definitions(-DGLEW_STATIC)
+    target_link_libraries(${TARGET_NAME} "${GLEW_LIBRARIES}")
+  endif()
+endif (APPLE)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies()