Skip to content
Snippets Groups Projects
Commit bc4f1d6c authored by Novak, Matus (UG - Computer Science)'s avatar Novak, Matus (UG - Computer Science)
Browse files

Added missing MinGW dependencies for PortAudio

parent 60215255
No related branches found
No related tags found
No related merge requests found
Pipeline #9396 failed
......@@ -45,3 +45,6 @@ tex2pdf*
# doxygen
doxygen/*.md
doxygen/xml
# VS Code
.vscode/ipch/
#ifndef REW_PHYSICAL_AUDIO_READER
#define REW_PHYSICAL_AUDIO_READER
#include "../common/output.h"
#include "../common/audio_device.h"
#include <vector>
#include <mutex>
#include <queue>
#include <array>
#include <condition_variable>
#include "../common/output.h"
#include "../common/audio_device.h"
#ifndef PORTAUDIO_H
typedef void PaStream;
......
#ifndef REW_PHYSICAL_AUDIO_SINK
#define REW_PHYSICAL_AUDIO_SINK
#include "../common/output.h"
#include "../common/audio_device.h"
#include <mutex>
#include <queue>
#include <vector>
#include <condition_variable>
#include "../common/output.h"
#include "../common/audio_device.h"
#ifndef PORTAUDIO_H
typedef void PaStream;
......
......@@ -5,7 +5,7 @@ include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
ExternalProject_Add(ZLIB
DOWNLOAD_COMMAND ""
SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib
CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true
CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -DCMAKE_SH="CMAKE_SH-NOTFOUND"
BUILD_COMMAND cmake --build . --target zlibstatic --config MinSizeRel
INSTALL_COMMAND ""
TEST_COMMAND ""
......@@ -25,7 +25,7 @@ endif()
ExternalProject_Add(PortAudio
DOWNLOAD_COMMAND ""
SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/portaudio
CMAKE_ARGS --DPA_BUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -DPA_BUILD_STATIC=ON -DPA_BUILD_TESTS=OFF -DPA_BUILD_EXAMPLES=OFF
CMAKE_ARGS --DPA_BUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -DPA_BUILD_STATIC=ON -DPA_BUILD_TESTS=OFF -DPA_BUILD_EXAMPLES=OFF -DCMAKE_SH="CMAKE_SH-NOTFOUND"
BUILD_COMMAND cmake --build . --target portaudio_static --config MinSizeRel
INSTALL_COMMAND ""
TEST_COMMAND ""
......@@ -33,13 +33,14 @@ ExternalProject_Add(PortAudio
if(MSVC)
set(PORTAUDIO_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/portaudio/include ${CMAKE_BINARY_DIR}/libs/PortAudio-prefix/src/PortAudio-build PARENT_SCOPE)
set(PORTAUDIO_LIBRARY ${CMAKE_BINARY_DIR}/libs/PortAudio-prefix/src/PortAudio-build/MinSizeRel/portaudio_static_x86.lib PARENT_SCOPE)
elseif(MINGW)
#set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib ${CMAKE_BINARY_DIR}/libs/ZLIB-prefix/src/ZLIB-build PARENT_SCOPE)
#set(ZLIB_LIBRARY ${CMAKE_BINARY_DIR}/libs/ZLIB-prefix/src/ZLIB-build/libzlibstatic.a PARENT_SCOPE)
if (CMAKE_CL_64)
set(PORTAUDIO_LIBRARY ${CMAKE_BINARY_DIR}/libs/PortAudio-prefix/src/PortAudio-build/MinSizeRel/portaudio_static_x64.lib PARENT_SCOPE)
else()
set(PORTAUDIO_LIBRARY ${CMAKE_BINARY_DIR}/libs/PortAudio-prefix/src/PortAudio-build/MinSizeRel/portaudio_static_x86.lib PARENT_SCOPE)
endif()
else()
#set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib ${CMAKE_BINARY_DIR}/libs/ZLIB-prefix/src/ZLIB-build PARENT_SCOPE)
#set(ZLIB_LIBRARY ${CMAKE_BINARY_DIR}/libs/ZLIB-prefix/src/ZLIB-build/libz.a PARENT_SCOPE)
set(PORTAUDIO_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/portaudio/include ${CMAKE_BINARY_DIR}/libs/PortAudio-prefix/src/PortAudio-build PARENT_SCOPE)
set(PORTAUDIO_LIBRARY ${CMAKE_BINARY_DIR}/libs/PortAudio-prefix/src/PortAudio-build/libportaudio.a PARENT_SCOPE)
endif()
# Add third party libraries which do not need compilation step
......
......@@ -23,10 +23,13 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PORTAUDIO_INCLUDE_DIR})
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARY} ${PORTAUDIO_LIBRARY})
add_dependencies(${PROJECT_NAME} ZLIB)
add_dependencies(${PROJECT_NAME} ZLIB PortAudio)
if(WIN32)
target_link_libraries(${PROJECT_NAME} wsock32 ws2_32)
target_link_libraries(${PROJECT_NAME} wsock32 ws2_32)
endif()
if(MINGW)
target_link_libraries(${PROJECT_NAME} Winmm SetupAPI)
endif()
set(DECODER_PROJECT ${PROJECT_NAME} PARENT_SCOPE)
......
......@@ -22,7 +22,12 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PORTAUDIO_INCLUDE_DIR})
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARY} ${PORTAUDIO_LIBRARY})
add_dependencies(${PROJECT_NAME} ZLIB)
add_dependencies(${PROJECT_NAME} ZLIB PortAudio)
if(MINGW)
target_link_libraries(${PROJECT_NAME} Winmm SetupAPI)
endif()
set(ENCODER_PROJECT ${PROJECT_NAME} PARENT_SCOPE)
set(ENCODER_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/encoder PARENT_SCOPE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment