From 7cec30dede5f9a9731f97c7174b38b2e3c3210ce Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@replicant.com>
Date: Mon, 5 May 2014 15:37:02 -0700
Subject: [PATCH] fix Linux build optional Midi under Linux (ALSA/libasound)

---
 btgui/MidiTest/cmidiin.cpp      | 3 ++-
 btgui/MidiTest/premake4.lua     | 2 ++
 btgui/OpenGLWindow/premake4.lua | 4 +---
 build3/premake4.lua             | 7 +++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/btgui/MidiTest/cmidiin.cpp b/btgui/MidiTest/cmidiin.cpp
index bc5e3aaf9..9de7ab83c 100644
--- a/btgui/MidiTest/cmidiin.cpp
+++ b/btgui/MidiTest/cmidiin.cpp
@@ -58,7 +58,8 @@ int main( int argc, char *argv[] )
     std::cout << "\nReading MIDI input ... press <enter> to quit.\n";
     char input;
     std::cin.get(input);
-//	getchar();
+	std::cin.get(input);
+
 
 
  cleanup:
diff --git a/btgui/MidiTest/premake4.lua b/btgui/MidiTest/premake4.lua
index 639f23223..e09468e6a 100644
--- a/btgui/MidiTest/premake4.lua
+++ b/btgui/MidiTest/premake4.lua
@@ -26,6 +26,8 @@
 	end
 
 	if os.is("Linux") then 
+		defines {"__LINUX_ALSA__"}
+                links {"asound","pthread"}
 	end
 
 	if os.is("MacOSX") then
diff --git a/btgui/OpenGLWindow/premake4.lua b/btgui/OpenGLWindow/premake4.lua
index b6c869646..be45bbe0d 100644
--- a/btgui/OpenGLWindow/premake4.lua
+++ b/btgui/OpenGLWindow/premake4.lua
@@ -30,9 +30,7 @@
       	"Win32Window.h",
 			}
 		end
-		if os.is("Linux") then
-			links {"pthread"}
-		else
+		if not os.is("Linux") then
 			excludes {
 				"X11OpenGLWindow.cpp",
 				"X11OpenGLWindows.h"
diff --git a/build3/premake4.lua b/build3/premake4.lua
index a5c308db5..9f3c22fde 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -19,7 +19,7 @@
 		description = "Use Midi controller to control parameters"
 	}
 	
-	--_OPTIONS["midi"] = "1";
+--	_OPTIONS["midi"] = "1";
 	
 	newoption
 	{
@@ -118,7 +118,10 @@ include "../Demos3/SimpleOpenGL3"
 	include "../test/lua"
 	
 --		include "../demo/gpudemo"
-	include "../btgui/MidiTest"
+if _OPTIONS["midi"] then
+                include "../btgui/MidiTest"
+end
+
 --		include "../opencl/vector_add_simplified"
 --		include "../opencl/vector_add"
 		include "../btgui/Gwen"