From 8a859c661bbc13c9920f96f431c7754043a2cafc Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Fri, 20 Feb 2015 00:34:32 -0500 Subject: [PATCH] MSVC + Win32/x86 patch --- CMakeLists.txt | 8 ++++++++ src/audio/AudioThread.cpp | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a25a14..a87c7a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,14 @@ else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) SET( EX_PLATFORM_NAME "x86" ) endif( CMAKE_SIZEOF_VOID_P EQUAL 8 ) +if ( WIN32 AND EX_PLATFORM EQUAL 64) + set(BUILD_X86 OFF CACHE BOOL "Copy & Build 32-bit files even if 64-bit compiler is detected.") + if (BUILD_X86) + SET( EX_PLATFORM 32 ) + SET( EX_PLATFORM_NAME "x86" ) + endif (BUILD_X86) +endif ( WIN32 AND EX_PLATFORM EQUAL 64) + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME}) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME}) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME}) diff --git a/src/audio/AudioThread.cpp b/src/audio/AudioThread.cpp index a3449bd..b986a51 100644 --- a/src/audio/AudioThread.cpp +++ b/src/audio/AudioThread.cpp @@ -336,8 +336,9 @@ void AudioThread::setupDevice(int deviceId) { if (deviceController.find(outputDevice.load()) != deviceController.end()) { deviceController[outputDevice.load()]->removeThread(this); } - +#ifndef _MSC_VER opts.priority = sched_get_priority_max(SCHED_FIFO); +#endif // opts.flags = RTAUDIO_MINIMIZE_LATENCY; opts.flags = RTAUDIO_SCHEDULE_REALTIME;