diff --git a/cmake/modules/FindLodePNG.cmake b/cmake/modules/FindLodePNG.cmake index d3631df907..4568d59765 100644 --- a/cmake/modules/FindLodePNG.cmake +++ b/cmake/modules/FindLodePNG.cmake @@ -15,9 +15,12 @@ if (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS) # in cache already set(LODEPNG_FOUND TRUE) else (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS) - + + FIND_PATH(LODEPNG_INCLUDE_DIR "lodepng.h" + PATHS ${LODEPNG_ROOT_DIR}) + set(LODEPNG_INCLUDE_DIRS - ${LODEPNG_ROOT_DIR}/lodepng.h + ${LODEPNG_INCLUDE_DIR} ) set(LODEPNG_LIBRARY diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index f1712aca8f..efccdd9a70 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -45,23 +45,23 @@ ExternalProject_Add( BUILD_COMMAND make ) -if (UNIX AND NOT APPLE) - find_package(Threads REQUIRED) - find_package(Librt REQUIRED) - find_package(Jack REQUIRED) - find_package(ALSA REQUIRED) - - target_link_libraries(portaudio - ${CMAKE_THREAD_LIBS_INIT} - ${LIBRT_LIBRARIES} - ${JACK_LIBRARIES} - ${ALSA_LIBRARIES} - ) -endif (UNIX AND NOT APPLE) - ExternalProject_Get_Property(portaudio binary_dir) ExternalProject_Get_Property(portaudio source_dir) include_directories(${source_dir}/include) add_dependencies(interface portaudio) -target_link_libraries(interface ${binary_dir}/lib/.libs/libportaudio.a) \ No newline at end of file +target_link_libraries(interface ${binary_dir}/lib/.libs/libportaudio.a) + +if (UNIX AND NOT APPLE) + find_package(Threads REQUIRED) + find_package(Librt REQUIRED) + find_package(ALSA) + find_package(Jack) + + target_link_libraries(interface + ${CMAKE_THREAD_LIBS_INIT} + ${LIBRT_LIBRARIES} + ${JACK_LIBRARIES} + ${ALSA_LIBRARIES} + ) +endif (UNIX AND NOT APPLE) \ No newline at end of file diff --git a/interface/src/AudioSource.cpp b/interface/src/AudioSource.cpp index 90955ed274..07b3d2ce65 100644 --- a/interface/src/AudioSource.cpp +++ b/interface/src/AudioSource.cpp @@ -23,7 +23,11 @@ int AudioSource::loadDataFromFile(const char *filename) { std::rewind(soundFile); sourceData = new int16_t[lengthInSamples]; - std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile); + size_t bytesRead = std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile); + + if (bytesRead != lengthInSamples) { + std::cout << "Error loading audio source data from file " << filename << "!\n"; + } std::fclose(soundFile);