FreeBSD build version

devnexen · zonkmachine · commit 732448c3921d · 2019-10-18T16:52:38.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -431,9 +431,9 @@ If(WANT_GIG)
 ENDIF(WANT_GIG)
 
 # check for pthreads
-IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 	FIND_PACKAGE(Threads)
-ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 
 IF(WANT_SNDIO)
 	FIND_PACKAGE(Sndio)
diff --git 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()
diff --git a/include/versioninfo.h b/include/versioninfo.h
@@ -28,6 +28,10 @@
 #define PLATFORM "OpenBSD"
 #endif
 
+#ifdef LMMS_BUILD_FREEBSD
+#define PLATFORM "FreeBSD"
+#endif
+
 #ifdef LMMS_BUILD_WIN32
 #define PLATFORM "win32"
 #endif
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(BuildPlugin)
 
 
 # definitions for ZynAddSubFX
-IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 	FIND_PACKAGE(X11)
 	INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
 	ADD_DEFINITIONS(-DOS_LINUX)
diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
@@ -1242,7 +1242,7 @@ void Mixer::fifoWriter::run()
 	disable_denormals();
 
 #if 0
-#ifdef LMMS_BUILD_LINUX
+#if defined(LMMS_BUILD_LINUX) || defined(LMMS_BUILD_FREEBSD)
 #ifdef LMMS_HAVE_SCHED_H
 	cpu_set_t mask;
 	CPU_ZERO( &mask );
diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp
@@ -162,7 +162,7 @@ void ProjectRenderer::run()
 {
 	MemoryManager::ThreadGuard mmThreadGuard; Q_UNUSED(mmThreadGuard);
 #if 0
-#ifdef LMMS_BUILD_LINUX
+#if defined(LMMS_BUILD_LINUX) || defined(LMMS_BUILD_FREEBSD)
 #ifdef LMMS_HAVE_SCHED_H
 	cpu_set_t mask;
 	CPU_ZERO( &mask );
diff --git a/src/core/main.cpp b/src/core/main.cpp
@@ -666,7 +666,7 @@ int main( int argc, char * * argv )
 
 
 	// try to set realtime priority
-#ifdef LMMS_BUILD_LINUX
+#if defined(LMMS_BUILD_LINUX) || defined(LMMS_BUILD_FREEBSD)
 #ifdef LMMS_HAVE_SCHED_H
 #ifndef __OpenBSD__
 	struct sched_param sparam;
diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp
@@ -200,7 +200,7 @@ int PianoView::getKeyFromKeyEvent( QKeyEvent * _ke )
 		case 27: return 31; // ]
 	}
 #endif
-#if defined(LMMS_BUILD_LINUX) || defined(LMMS_BUILD_OPENBSD)
+#if defined(LMMS_BUILD_LINUX) || defined(LMMS_BUILD_OPENBSD) || defined(LMMS_BUILD_FREEBSD)
 	switch( k )
 	{
 		case 52: return 0; // Z  = C
diff --git a/src/lmmsconfig.h.in b/src/lmmsconfig.h.in
@@ -3,6 +3,7 @@
 #cmakedefine LMMS_BUILD_WIN64
 #cmakedefine LMMS_BUILD_APPLE
 #cmakedefine LMMS_BUILD_OPENBSD
+#cmakedefine LMMS_BUILD_FREEBSD
 #cmakedefine LMMS_BUILD_HAIKU
 
 #cmakedefine LMMS_HOST_X86

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void ProjectRenderer::run()`
`162`	`162`	`{`
`163`	`163`	`MemoryManager::ThreadGuard mmThreadGuard; Q_UNUSED(mmThreadGuard);`
`164`	`164`	`#if 0`
`165`		`-#ifdef LMMS_BUILD_LINUX`
	`165`	`+#if defined(LMMS_BUILD_LINUX) \|\| defined(LMMS_BUILD_FREEBSD)`
`166`	`166`	`#ifdef LMMS_HAVE_SCHED_H`
`167`	`167`	`cpu_set_t mask;`
`168`	`168`	`CPU_ZERO( &mask );`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ int PianoView::getKeyFromKeyEvent( QKeyEvent * _ke )`
`200`	`200`	`case 27: return 31; // ]`
`201`	`201`	`}`
`202`	`202`	`#endif`
`203`		`-#if defined(LMMS_BUILD_LINUX) \|\| defined(LMMS_BUILD_OPENBSD)`
	`203`	`+#if defined(LMMS_BUILD_LINUX) \|\| defined(LMMS_BUILD_OPENBSD) \|\| defined(LMMS_BUILD_FREEBSD)`
`204`	`204`	`switch( k )`
`205`	`205`	`{`
`206`	`206`	`case 52: return 0; // Z = C`