Merge branch 'master' into cmake_dist

# Conflicts: # include/Plugin.h # src/core/Plugin.cpp
2015-03-21 11:53:00 +01:00
parent 35e1c4ed89 de9f879dde
commit e0f077ba02
105 changed files with 3436 additions and 1823 deletions
--- a/cmake/modules/DetectMachine.cmake
+++ b/cmake/modules/DetectMachine.cmake
@@ -1,11 +1,11 @@
 IF(WIN32)
 	SET(LMMS_BUILD_WIN32 1)
-ELSE(WIN32)
-	IF(APPLE)
-		SET(LMMS_BUILD_APPLE 1)
-	ELSE(APPLE)
-		SET(LMMS_BUILD_LINUX 1)
-	ENDIF(APPLE)
+ELSEIF(APPLE)
+	SET(LMMS_BUILD_APPLE 1)
+ELSEIF(HAIKU)
+	SET(LMMS_BUILD_HAIKU 1)
+ELSE()
+	SET(LMMS_BUILD_LINUX 1)
 ENDIF(WIN32)

 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")