MSVC + Win32/x86 patch

cjcliffe · Feb 20, 2015 · 8a859c6 · 8a859c6
1 parent 14881ac
commit 8a859c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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;