|
|
|
@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
Date: Sun, 8 Sep 2019 18:22:33 +1000
|
|
|
|
|
Subject: [PATCH 1/2] Allow optional build of bins, docs, and tests
|
|
|
|
|
Subject: [PATCH 1/3] Allow optional build of bins, docs, and tests
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
@ -98,7 +98,7 @@ index 1111111..2222222 100644
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
Date: Sun, 8 Sep 2019 18:24:56 +1000
|
|
|
|
|
Subject: [PATCH 2/2] Set *.pc libs/requires based on detected features
|
|
|
|
|
Subject: [PATCH 2/3] Set *.pc libs/requires based on detected features
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
@ -171,3 +171,26 @@ index 1111111..2222222 100644
|
|
|
|
|
+Requires: @PC_REQUIRES@
|
|
|
|
|
+Libs: -L${libdir} -lfluidsynth @PC_LIBS@
|
|
|
|
|
Cflags: -I${includedir}
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
Date: Sat, 14 Sep 2019 12:09:14 +1000
|
|
|
|
|
Subject: [PATCH 3/3] use detected mman libs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -261,6 +261,11 @@ if ( WIN32 )
|
|
|
|
|
if ( MINGW )
|
|
|
|
|
set ( MINGW32 1 )
|
|
|
|
|
add_compile_options ( -mms-bitfields )
|
|
|
|
|
+ # mman-win32
|
|
|
|
|
+ if ( HAVE_SYS_MMAN_H )
|
|
|
|
|
+ set ( WINDOWS_LIBS "${WINDOWS_LIBS};mman" )
|
|
|
|
|
+ set ( PC_LIBS "${PC_LIBS} -lmman" )
|
|
|
|
|
+ endif ()
|
|
|
|
|
endif ( MINGW )
|
|
|
|
|
else ( WIN32 )
|
|
|
|
|
# Check PThreads, but not in Windows
|
|
|
|
|