Merge pull request #3 from hyperion-project/master

.

dependencies/CMakeLists.txt

@@ -12,7 +12,11 @@ endif()
 set(USE_SYSTEM_FLATBUFFERS_LIBS ${DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS} CACHE BOOL "use flatbuffers library from system")
 
 if (USE_SYSTEM_FLATBUFFERS_LIBS)
-	find_package(flatbuffers REQUIRED)
+	if (ENABLE_AMLOGIC)
+		find_program(FLATBUFFERS_FLATC_EXECUTABLE NAMES flatc REQUIRED)
+	else ()
+		find_package(flatbuffers REQUIRED)
+	endif()
 	include_directories(${FLATBUFFERS_INCLUDE_DIRS})
 else ()
 	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared flatbuffers library")
@@ -41,12 +45,21 @@ message(STATUS "Using flatbuffers compiler: " ${FLATBUFFERS_FLATC_EXECUTABLE})
 
 
 function(compile_flattbuffer_schema SRC_FBS OUTPUT_DIR)
-  string(REGEX REPLACE "\\.fbs$" "_generated.h" GEN_HEADER ${SRC_FBS})
-  add_custom_command(
-    OUTPUT ${GEN_HEADER}
-    COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable
-			--gen-object-api
-			-o "${OUTPUT_DIR}"
-			"${SRC_FBS}"
-    DEPENDS flatc)
+	string(REGEX REPLACE "\\.fbs$" "_generated.h" GEN_HEADER ${SRC_FBS})
+	if (ENABLE_AMLOGIC)
+		add_custom_command(
+			OUTPUT ${GEN_HEADER}
+			COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable
+					--gen-object-api
+					-o "${OUTPUT_DIR}"
+					"${SRC_FBS}")
+	else()
+		add_custom_command(
+			OUTPUT ${GEN_HEADER}
+			COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable
+					--gen-object-api
+					-o "${OUTPUT_DIR}"
+					"${SRC_FBS}"
+			DEPENDS flatc)
+	endif()
 endfunction()

include/bonjour/bonjourservicebrowser.h

@@ -30,7 +30,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define BONJOURSERVICEBROWSER_H
 
 #include <QtCore/QObject>
+#ifndef PLATFORM_AMLOGIC
 #include <dns_sd.h>
+#else
+#include <avahi-compat-libdns_sd/dns_sd.h>
+#endif
 #include "bonjour/bonjourrecord.h"
 
 

include/bonjour/bonjourserviceregister.h

@@ -34,7 +34,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "bonjourrecord.h"
 class QSocketNotifier;
 
+#ifndef PLATFORM_AMLOGIC
 #include <dns_sd.h>
+#else
+#include <avahi-compat-libdns_sd/dns_sd.h>
+#endif
 
 class BonjourServiceRegister : public QObject
 {

include/bonjour/bonjourserviceresolver.h

@@ -31,9 +31,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <QtCore/QObject>
 
-
+#ifndef PLATFORM_AMLOGIC
 #include <dns_sd.h>
-
+#else
+#include <avahi-compat-libdns_sd/dns_sd.h>
+#endif
 class QSocketNotifier;
 class QHostInfo;
 class BonjourRecord;

src/hyperion-aml/CMakeLists.txt

@@ -35,6 +35,12 @@ target_link_libraries(${PROJECT_NAME}
 	Qt5::Network
 )
 
+if (ENABLE_AMLOGIC)
+	target_link_libraries(${PROJECT_NAME}
+		pcre16 dl z
+	)
+endif()
+
 install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
 
 if(CMAKE_HOST_UNIX)

src/hyperion-framebuffer/CMakeLists.txt

@@ -34,6 +34,12 @@ target_link_libraries( ${PROJECT_NAME}
 	Qt5::Network
 )
 
+if (ENABLE_AMLOGIC)
+	target_link_libraries( ${PROJECT_NAME}
+		pcre16 dl z
+	)
+endif()
+
 install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
 
 if(CMAKE_HOST_UNIX)

src/hyperion-remote/CMakeLists.txt

@@ -29,6 +29,12 @@ target_link_libraries(${PROJECT_NAME}
 	Qt5::Core
 	Qt5::Network)
 
+if (ENABLE_AMLOGIC)
+	target_link_libraries(${PROJECT_NAME}
+		pcre16 dl z
+	)
+endif()
+
 install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
 
 if(CMAKE_HOST_UNIX)

src/hyperion-v4l2/CMakeLists.txt

@@ -34,6 +34,12 @@ target_link_libraries(${PROJECT_NAME}
 	Qt5::Network
 )
 
+if (ENABLE_AMLOGIC)
+	target_link_libraries(${PROJECT_NAME}
+		pcre16 dl z
+	)
+endif()
+
 install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
 
 if(CMAKE_HOST_UNIX)

src/hyperiond/CMakeLists.txt

@@ -24,6 +24,13 @@ target_link_libraries(hyperiond
 		${PYTHON_LIBRARIES}
 )
 
+if (ENABLE_AMLOGIC)
+	target_link_libraries(hyperiond
+		Qt5::Core
+		pcre16 dl z
+	)
+endif()
+
 if (ENABLE_DISPMANX)
 	IF ( "${PLATFORM}" MATCHES rpi)
 		find_package(BCM REQUIRED)