Merge remote-tracking branch 'upstream/pr/136'
authorStephen Sinclair <radarsat1@gmail.com>
Wed, 8 Aug 2018 14:30:51 +0000 (10:30 -0400)
committerStephen Sinclair <radarsat1@gmail.com>
Wed, 8 Aug 2018 14:30:51 +0000 (10:30 -0400)
1  2 
RtAudio.cpp
tests/CMakeLists.txt

diff --cc RtAudio.cpp
Simple merge
index 5c08f6d3d71a90e9895c378ff04efaa85a3955f3,f611d5110bca512c701ec9b47f8d12f73d9b3011..0040065b164a41e0065c4877c88c22001306bc7f
@@@ -3,25 -3,26 +3,28 @@@ if (WIN32
      include_directories(../include)
  endif (WIN32)
  
 +list(GET LIB_TARGETS 0 LIBRTAUDIO)
 +
  add_executable(audioprobe audioprobe.cpp)
 -target_link_libraries(audioprobe rtaudio_static ${LINKLIBS})
 +target_link_libraries(audioprobe ${LIBRTAUDIO} ${LINKLIBS})
  
  add_executable(playsaw playsaw.cpp)
 -target_link_libraries(playsaw rtaudio_static ${LINKLIBS})
 +target_link_libraries(playsaw ${LIBRTAUDIO} ${LINKLIBS})
  
  add_executable(playraw playraw.cpp)
 -target_link_libraries(playraw rtaudio_static ${LINKLIBS})
 +target_link_libraries(playraw ${LIBRTAUDIO} ${LINKLIBS})
  
  add_executable(record record.cpp)
 -target_link_libraries(record rtaudio_static ${LINKLIBS})
 +target_link_libraries(record ${LIBRTAUDIO} ${LINKLIBS})
  
  add_executable(duplex duplex.cpp)
 -target_link_libraries(duplex rtaudio_static ${LINKLIBS})
 +target_link_libraries(duplex ${LIBRTAUDIO} ${LINKLIBS})
  
+ add_executable(apinames apinames.cpp)
+ target_link_libraries(apinames rtaudio_static ${LINKLIBS})
  add_executable(testall testall.cpp)
 -target_link_libraries(testall rtaudio_static ${LINKLIBS})
 +target_link_libraries(testall ${LIBRTAUDIO} ${LINKLIBS})
  
  add_executable(teststops teststops.cpp)
 -target_link_libraries(teststops rtaudio_static ${LINKLIBS})
 +target_link_libraries(teststops ${LIBRTAUDIO} ${LINKLIBS})