Fixing up Windows build.
This commit is contained in:
parent
32ace0fcac
commit
5d32592126
22 changed files with 247994 additions and 53 deletions
|
@ -1,11 +1,16 @@
|
|||
#include "AudioManager.h"
|
||||
|
||||
#ifdef __linux__
|
||||
#include "AlsaInterface.h"
|
||||
#endif
|
||||
|
||||
AudioManager::AudioManager()
|
||||
: mAudioDevices(),
|
||||
mAudioInterface()
|
||||
{
|
||||
#ifdef __linux__
|
||||
mAudioInterface = AlsaInterface::Create();
|
||||
#endif
|
||||
}
|
||||
|
||||
AudioManager::~AudioManager()
|
||||
|
@ -28,7 +33,7 @@ IAudioInterface* AudioManager::GetAudioInterface()
|
|||
return mAudioInterface.get();
|
||||
}
|
||||
|
||||
unsigned AudioManager::GetNumAudioDevices() const
|
||||
std::size_t AudioManager::GetNumAudioDevices() const
|
||||
{
|
||||
return mAudioDevices.size();
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ public:
|
|||
|
||||
void AddAudioDevice(AudioDevicePtr device);
|
||||
|
||||
unsigned GetNumAudioDevices() const;
|
||||
std::size_t GetNumAudioDevices() const;
|
||||
|
||||
AudioDevice* GetAudioDevice(unsigned idx) const;
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
#include "AudioSynth.h"
|
||||
#define _USE_MATH_DEFINES
|
||||
#include <cmath>
|
||||
#include <math.h>
|
||||
#include <limits>
|
||||
#include <iostream>
|
||||
|
|
|
@ -1,10 +1,20 @@
|
|||
|
||||
set(platform_HEADERS "")
|
||||
set(platform_INCLUDES "")
|
||||
|
||||
if (UNIX)
|
||||
find_package(ALSA REQUIRED)
|
||||
|
||||
list(APPEND linux_HEADERS
|
||||
list(APPEND platform_HEADERS
|
||||
audio_interfaces/AlsaInterface.h
|
||||
${ALSA_INCLUDE_DIRS}
|
||||
)
|
||||
list(APPEND platform_INCLUDES
|
||||
audio_interfaces/AlsaInterface.cpp
|
||||
)
|
||||
list(APPEND platform_LIBS
|
||||
${ALSA_LIBRARIES}
|
||||
)
|
||||
endif (UNIX)
|
||||
|
||||
list(APPEND audio_HEADERS
|
||||
AudioDevice.h
|
||||
|
@ -20,11 +30,8 @@ list(APPEND audio_HEADERS
|
|||
midi/MidiElements.h
|
||||
midi/MidiEvent.h
|
||||
midi/MetaMidiEvent.h
|
||||
midi/MidiChannelEvent.h)
|
||||
|
||||
list(APPEND linux_INCLUDES
|
||||
audio_interfaces/AlsaInterface.cpp
|
||||
)
|
||||
midi/MidiChannelEvent.h
|
||||
${platform_HEADERS})
|
||||
|
||||
list(APPEND audio_LIB_INCLUDES
|
||||
AudioDevice.cpp
|
||||
|
@ -41,9 +48,10 @@ list(APPEND audio_LIB_INCLUDES
|
|||
midi/MidiDocument.cpp
|
||||
midi/MidiEvent.cpp
|
||||
midi/MetaMidiEvent.cpp
|
||||
midi/MidiChannelEvent.cpp)
|
||||
midi/MidiChannelEvent.cpp
|
||||
${platform_INCLUDES})
|
||||
|
||||
add_library(audio SHARED ${audio_LIB_INCLUDES} ${linux_INCLUDES} ${audio_HEADERS} ${linux_HEADERS})
|
||||
add_library(audio SHARED ${audio_LIB_INCLUDES} ${platform_INCLUDES} ${audio_HEADERS} ${platform_HEADERS})
|
||||
target_include_directories(audio PUBLIC
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/src/core/file_utilities"
|
||||
|
@ -52,11 +60,7 @@ target_include_directories(audio PUBLIC
|
|||
"${CMAKE_CURRENT_SOURCE_DIR}/midi"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/midi/reader"
|
||||
)
|
||||
|
||||
list(APPEND linux_LIBS
|
||||
${ALSA_LIBRARIES}
|
||||
)
|
||||
|
||||
target_link_libraries(audio PUBLIC core ${linux_LIBS})
|
||||
target_link_libraries(audio PUBLIC core ${platform_LIBS})
|
||||
set_target_properties( audio PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
|
||||
set_property(TARGET audio PROPERTY FOLDER src)
|
Loading…
Add table
Add a link
Reference in a new issue