Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Linux build

Browse Source 
optional Midi under Linux (ALSA/libasound)
This commit is contained in:
Erwin Coumans
2014-05-05 15:37:02 -07:00
parent c1940169bc
commit 7cec30dede
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
btgui/MidiTest/cmidiin.cpp
View File

@@ -58,7 +58,8 @@ int main( int argc, char *argv[] )
std::cout << "\nReading MIDI input ... press <enter> to quit.\n"; std::cout << "\nReading MIDI input ... press <enter> to quit.\n";
char input; char input;
std::cin.get(input); std::cin.get(input);
// getchar(); std::cin.get(input);
cleanup: cleanup:

2
btgui/MidiTest/premake4.lua
View File

@@ -26,6 +26,8 @@
end end
if os.is("Linux") then if os.is("Linux") then
defines {"__LINUX_ALSA__"}
links {"asound","pthread"}
end end
if os.is("MacOSX") then if os.is("MacOSX") then

4
btgui/OpenGLWindow/premake4.lua
View File

@@ -30,9 +30,7 @@
"Win32Window.h", "Win32Window.h",
} }
end end
if os.is("Linux") then if not os.is("Linux") then
links {"pthread"}
else
excludes { excludes {
"X11OpenGLWindow.cpp", "X11OpenGLWindow.cpp",
"X11OpenGLWindows.h" "X11OpenGLWindows.h"

7
build3/premake4.lua
View File

@@ -19,7 +19,7 @@
description = "Use Midi controller to control parameters" description = "Use Midi controller to control parameters"
} }
--_OPTIONS["midi"] = "1"; -- _OPTIONS["midi"] = "1";
newoption newoption
{ {
@@ -118,7 +118,10 @@ include "../Demos3/SimpleOpenGL3"
include "../test/lua" include "../test/lua"
-- include "../demo/gpudemo" -- include "../demo/gpudemo"
include "../btgui/MidiTest" if _OPTIONS["midi"] then
include "../btgui/MidiTest"
end
-- include "../opencl/vector_add_simplified" -- include "../opencl/vector_add_simplified"
-- include "../opencl/vector_add" -- include "../opencl/vector_add"
include "../btgui/Gwen" include "../btgui/Gwen"