Merge branch 'master' into android

This commit is contained in:
Reece H. Dunn
2015-10-11 20:33:14 +01:00
10 changed files with 1118 additions and 493 deletions
+1 -1
View File
@@ -131,7 +131,7 @@ wave_LIBS = -lportaudio
wave_FLAGS = -DUSE_PORTAUDIO
else
if AUDIO_SADA
wave_SOURCE = wave_sada.cpp
wave_SOURCE = src/wave_sada.cpp
wave_FLAGS = -DUSE_SADA
else
wave_SOURCE = src/wave.cpp