shuffle files with QtGui dependency out of shared

cmake/macros/LinkHifiLibraries.cmake

@@ -27,11 +27,15 @@ macro(LINK_HIFI_LIBRARIES)
     
     # ask the library what its dynamic dependencies are and link them
     get_target_property(LINKED_TARGET_DEPENDENCY_LIBRARIES ${HIFI_LIBRARY} DEPENDENCY_LIBRARIES)
-    list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK ${LINKED_TARGET_DEPENDENCY_LIBRARIES})
+    if (LINKED_TARGET_DEPENDENCY_LIBRARIES)
+      list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK ${LINKED_TARGET_DEPENDENCY_LIBRARIES})
+    endif ()
     
     # ask the library what its include dependencies are and link them
     get_target_property(LINKED_TARGET_DEPENDENCY_INCLUDES ${HIFI_LIBRARY} DEPENDENCY_INCLUDES)
-    list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES ${LINKED_TARGET_DEPENDENCY_INCLUDES})
+    if (LINKED_TARGET_DEPENDENCY_INCLUDES)
+      list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES ${LINKED_TARGET_DEPENDENCY_INCLUDES})
+    endif()
     
   endforeach()
   

gvr-interface/CMakeLists.txt

@@ -10,9 +10,9 @@ setup_hifi_library()
 
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
-# include_glm()
+include_glm()
-#
+
-# link_hifi_libraries(shared networking)
+link_hifi_libraries(shared networking)
 link_shared_dependencies()
 
 target_link_libraries(${TARGET_NAME} log android)

gvr-interface/src/main.cpp

@@ -12,7 +12,7 @@
 #include <android_native_app_glue.h>
 #include <android/log.h>
 
-// #include <NodeList.h>
+#include <NodeList.h>
 
 // usage of log
 #define APP_NAME "Interface"
@@ -38,7 +38,7 @@ void android_main(struct android_app* state) {
     // set up so when commands happen we call our custom handler
     state->onAppCmd = custom_handle_cmd; 
     
-    // NodeList* nodeList = NodeList::createInstance(NodeType::Agent);
+    NodeList* nodeList = NodeList::createInstance(NodeType::Agent);
         
     while (1) {
         struct android_poll_source* source;

interface/src/FileUtils.cpp

@@ -1,6 +1,6 @@
 //
 //  FileUtils.cpp
-//  libraries/shared/src
+//  interface/src
 //
 //  Created by Stojce Slavkovski on 12/23/13.
 //  Copyright 2013 High Fidelity, Inc.
@@ -9,9 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <qdir.h>
+#include <qfileinfo.h>
+#include <qdesktopservices.h>
+#include <qprocess.h>
+#include <qurl.h>
+
 #include "FileUtils.h"
-#include <QtCore>
+
-#include <QDesktopServices>
 
 void FileUtils::locateFile(QString filePath) {
 

interface/src/FileUtils.h

@@ -1,6 +1,6 @@
 //
 //  FileUtils.h
-//  libraries/shared/src
+//  interface/src
 //
 //  Created by Stojce Slavkovski on 12/23/13.
 //  Copyright 2013 High Fidelity, Inc.

interface/src/UIUtil.cpp

@@ -1,6 +1,6 @@
 //
 //  UIUtil.cpp
-//  library/shared/src
+//  interface/src
 //
 //  Created by Ryan Huffman on 09/02/2014.
 //  Copyright 2014 High Fidelity, Inc.

interface/src/UIUtil.h

@@ -1,6 +1,6 @@
 //
 //  UIUtil.h
-//  library/shared/src
+//  interface/src
 //
 //  Created by Ryan Huffman on 09/02/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/shared/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(TARGET_NAME shared)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
-setup_hifi_library(Network Widgets)
+setup_hifi_library(Network)
 
 # call macro to link our dependencies and bubble them up via a property on our target
 link_shared_dependencies()