Reorganized headers for al_App.hpp. Don't build alloGLV if APR is not available

Author: Andres Cabrera

alloGLV/CMakeLists.txt

@@ -13,6 +13,13 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/bin)
 get_target_property(ALLOCORE_LIBRARY allocore${DEBUG_SUFFIX} LOCATION)
 get_target_property(ALLOCORE_DEP_INCLUDE_DIRS allocore${DEBUG_SUFFIX} ALLOCORE_DEP_INCLUDE_DIRS)
 
+find_package(APR QUIET)
+
+if(NOT (APR_LIBRARY AND APR_INCLUDE_DIR))
+    message(WARNING "APR not available, not building alloGLV")
+    return()
+endif()
+
 if(BUILDING_GLV)
     set(GLV_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../GLV)
     get_target_property(glv_location GLV LOCATION)

alloGLV/alloGLV/al_ProtoApp.hpp

@@ -44,6 +44,7 @@
 #include <math.h>
 #include <string>
 #include "allocore/io/al_App.hpp"
+#include "allocore/io/al_File.hpp"
 #include "alloGLV/al_ControlGLV.hpp"
 
 #include "GLV/glv.h"

allocore/allocore/io/al_App.hpp

@@ -44,16 +44,17 @@
 #include <math.h>
 #include <string>
 #include <vector>
-#include "allocore/al_Allocore.hpp"
+//#include "allocore/al_Allocore.hpp"
 
-/*#include "allocore/io/al_AudioIO.hpp"
+#include "allocore/io/al_AudioIO.hpp"
 #include "allocore/sound/al_AudioScene.hpp"
 #include "allocore/types/al_Color.hpp"
 #include "allocore/graphics/al_Lens.hpp"
 #include "allocore/graphics/al_Stereographic.hpp"
 #include "allocore/io/al_Window.hpp"
+#include "allocore/io/al_ControlNav.hpp"
 #include "allocore/protocol/al_OSC.hpp"
-#include "allocore/io/al_ControlNav.hpp"*/
+#include "allocore/system/al_MainLoop.hpp"
 
 namespace al{