Merge branch 'dev' of github.com:LabSound/LabSound into dev

LabSound · Jun 8, 2020 · 53c0dfe · 53c0dfe
2 parents 68bebbd + c4ef055
commit 53c0dfe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/cmake/LabSound.cmake b/cmake/LabSound.cmake
@@ -130,6 +130,7 @@ if (WIN32)
 elseif (APPLE)
     target_compile_definitions(LabSound PRIVATE __MACOSX_CORE__=1)
 else()
+    set(LABSOUND_PLATFORM_LINK_LIBRARIES dl)
     if (LABSOUND_JACK)
         target_compile_definitions(LabSound PRIVATE __UNIX_JACK__=1)
         set(LIBNYQUIST_JACK ON)
@@ -144,7 +145,7 @@ else()
     endif()
 endif()
 
-target_link_libraries(LabSound libnyquist libopus libwavpack dl)
+target_link_libraries(LabSound libnyquist libopus libwavpack ${LABSOUND_PLATFORM_LINK_LIBRARIES})
 
 install(TARGETS LabSound
     LIBRARY DESTINATION lib

diff --git a/include/LabSound/core/Profiler.h b/include/LabSound/core/Profiler.h
@@ -32,7 +32,7 @@ namespace lab
         {
             if (!s->finalized)
             {
-                std::chrono::system_clock::time_point end = std::chrono::system_clock::now();
+                //std::chrono::system_clock::time_point end = std::chrono::system_clock::now();
                 s->microseconds = std::chrono::system_clock::now() - _start;
                 s->finalized = true;
             }

diff --git a/src/internal/src/HRTFDatabase.cpp b/src/internal/src/HRTFDatabase.cpp
@@ -6,6 +6,8 @@
 #include "internal/Assertions.h"
 #include "internal/HRTFElevation.h"
 
+#include <stdexcept>
+
 using namespace std;
 
 namespace lab