Merge branch 'stable-1.2'

# Conflicts: # data/locale/pl.ts # include/SongEditor.h # plugins/vst_base/CMakeLists.txt # src/core/Song.cpp # src/gui/editors/SongEditor.cpp
2019-10-21 11:18:39 +09:00
parent 82c38193de dbf5f47149
commit 7ebaa0e211
23 changed files with 281 additions and 104 deletions
--- a/cmake/modules/DetectMachine.cmake
+++ b/cmake/modules/DetectMachine.cmake
@@ -4,6 +4,8 @@ ELSEIF(APPLE)
 	SET(LMMS_BUILD_APPLE 1)
 ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 	SET(LMMS_BUILD_OPENBSD 1)
+ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+	SET(LMMS_BUILD_FREEBSD 1)
 ELSEIF(HAIKU)
 	SET(LMMS_BUILD_HAIKU 1)
 ELSE()