Merge branch 'master' into add_effect_engine

Conflicts:
	CrossCompileHowto.txt

Former-commit-id: 644f194464bfdcb8adbaced43ec5300f8ec6d62c
This commit is contained in:
johan
2013-11-29 17:39:15 +01:00
19 changed files with 2368 additions and 35 deletions

View File

@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 2.8)
project(hyperion-remote)
# add protocol buffers
find_package(Protobuf REQUIRED)
# find Qt4
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
# The following I do not undrstand completely...