From: Marcus Tomlinson <themarcustomlinson@gmail.com>
Date: Fri, 12 Oct 2018 21:27:33 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/thestk/rtaudio
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=be6681af88cff41c9c856bca163b28654229d523;hp=-c;p=rtaudio-cdist.git

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

be6681af88cff41c9c856bca163b28654229d523
diff --combined CMakeLists.txt
index 14b1787,2ce3b4b..995b030
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -178,7 -178,7 +178,7 @@@ endif(
  # WASAPI
  if (RTAUDIO_API_WASAPI)
    set(NEED_WIN32LIBS ON)
 -  list(APPEND LINKLIBS uuid ksuser)
 +  list(APPEND LINKLIBS ksuser mfplat mfuuid wmcodecdspuuid)
    list(APPEND API_DEFS "-D__WINDOWS_WASAPI__")
    list(APPEND API_LIST "wasapi")
  endif()
@@@ -257,6 -257,7 +257,7 @@@ message(STATUS "Compiling with support 
  # 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 --combined configure.ac
index d3a0cc4,322f1b4..266ff48
--- a/configure.ac
+++ b/configure.ac
@@@ -86,8 -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"
@@@ -272,7 -272,7 +272,7 @@@ AS_CASE(["$systems"], [*" wasapi "*], 
       CPPFLAGS="-I$srcdir/include $CPPFLAGS"
       need_ole32=yes
       found="$found WASAPI"
 -     LIBS="-lwinmm -luuid -lksuser $LIBS"])
 +     LIBS="-lwinmm -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid $LIBS"])
  ])
  
  AS_IF([test -n "$need_ole32"], [LIBS="-lole32 $LIBS"])