Merge branch 'master' of https://github.com/thestk/rtaudio

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14b1787ff9e132acbbaaa04d7a1cab8d1d20cabd..995b0303e9732f95dfb146c2770197a887496a13 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -257,6 +257,7 @@ message(STATUS "Compiling with support for: ${apilist}")
 # PkgConfig file
 string(REPLACE ";" " " req "${PKGCONFIG_REQUIRES}")
 string(REPLACE ";" " " api "${API_DEFS}")
+set(prefix ${CMAKE_INSTALL_PREFIX})
 configure_file("rtaudio.pc.in" "rtaudio.pc" @ONLY)
 
 # Add install rule.

diff --git a/configure.ac b/configure.ac
index d3a0cc4cb45810b6db1d631068880d081b76b757..266ff488fd4fd70c479a978fe055981f6369f261 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,8 @@ AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
 AS_IF([test "x${GXX}" = "xyes" ], [
   CXXFLAGS="-Wall -Wextra ${CXXFLAGS}"
   AS_IF([ test "x${enable_debug}" = "xyes" ], [
-    # Add -Werror in debug mode
-    CXXFLAGS="-Werror ${CXXFLAGS}"
+    # Add -Werror in debug mode (except unused-function)
+    CXXFLAGS="-Werror -Wno-error=unused-function ${CXXFLAGS}"
   ], [
     # hide private symbols in non-debug mode
     visibility="-fvisibility=hidden"

diff --git a/rtaudio.pc.in b/rtaudio.pc.in
index 762778060ebd0bc12c423284c6e694bc963dc336..0e81090dfede61890e45f2b1e01748cdad16b658 100644 (file)
--- a/rtaudio.pc.in
+++ b/rtaudio.pc.in
@@ -1,4 +1,4 @@
-prefix=@CMAKE_INSTALL_PREFIX@
+prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include/rtaudio        

diff --git a/tests/audioprobe.cpp b/tests/audioprobe.cpp
index 1b93908748e3d8dd8ed5d3484e8d39bd223504ea..c83d3a5f45600cb7bd75895b363e45e0707d813f 100644 (file)
--- a/tests/audioprobe.cpp
+++ b/tests/audioprobe.cpp
@@ -46,6 +46,7 @@ int main()
     info = audio.getDeviceInfo(i);
 
     std::cout << "\nDevice Name = " << info.name << '\n';
+    std::cout << "Device ID = " << i << '\n';
     if ( info.probed == false )
       std::cout << "Probe Status = UNsuccessful\n";
     else {