3.7win without IPC fix

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "external_libraries/hidapi"]
 	path = external_libraries/hidapi
 	url = git://github.com/sensestage/hidapi.git
+[submodule "external_libraries/portaudio"]
+	path = external_libraries/portaudio
+	url = https://github.com/bagong/portaudio

CMakeLists.txt

@@ -24,6 +24,18 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	message(WARNING "WARNING: IN-PLACE BUILDS ARE NOT RECOMMENDED - PLEASE USE A BUILD DIRECTORY")
 endif()
 
+# allows cmake-find modules and Windows installer to identify the right architecture
+if(WIN32)
+    if(CMAKE_CL_64 OR "$ENV{MSYSTEM}" MATCHES "64" OR CMAKE_C_COMPILER MATCHES "64")
+        SET(CMAKE_LIBRARY_ARCHITECTURE "x64" CACHE STRING "Architecture of target system (for 64bit)")
+    else()
+        SET(CMAKE_LIBRARY_ARCHITECTURE "x86" CACHE STRING "Architecture of target system (for 32bit)")
+    endif()
+
+    if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+        SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/Install" CACHE STRING "Cmake install path" FORCE)
+    endif()
+endif(WIN32)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules
                       ${CMAKE_MODULE_PATH})
@@ -123,7 +135,7 @@ if (SC_QT)
   message( STATUS "Compiling with Qt GUI" )
 else()
   if (SC_IDE)
-	  message( STATUS "Not compiling SC IDE, because it requires Qt but SC_QT is False" )
+      message( STATUS "Not compiling SC IDE, because it requires Qt but SC_QT is False" )
     set(SC_IDE False)
   endif()
 endif (SC_QT)
@@ -142,7 +154,11 @@ option(SC_MEMORY_DEBUGGING "Build sclang&scsynth for memory debugging (disable m
 option(GC_SANITYCHECK "Enable sanity checks in the sclang garbage collector.")
 
 option(NO_LIBSNDFILE "Disable soundfile functionality. (Not recommended.)" OFF)
-option(NO_AVAHI "Disable Avahi support. (Not recommended.)" OFF)
+if(WIN32)
+    option(NO_AVAHI "Disable Avahi support. (Not recommended.)" ON)
+else(WIN32)
+    option(NO_AVAHI "Disable Avahi support. (Not recommended.)" OFF)
+endif(WIN32)
 option(NO_GPL3 "Disable GPL3 code, for pure-GPL2 situations. (Not recommended.)" OFF)
 
 option(SCLANG_SERVER "Build with internal server." ON)
@@ -176,6 +192,19 @@ if (NOT WIN32)
     include_directories(${PTHREADS_INCLUDE_DIR})
 endif()
 
+if(WIN32)
+    find_package(Portaudio)
+    set(PA_LIBRARY_TYPE "STATIC")
+    if(MSVC AND NOT PORTAUDIO_FOUND_RELEASE_DEBUG)
+        set(SC_BUILD_PA ON CACHE BOOL "Building portaudio with SC" FORCE)
+        set(PORTAUDIO_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/external_libraries/portaudio/include )
+    elseif(MINGW AND NOT PORTAUDIO_FOUND)
+        set(SC_BUILD_PA ON CACHE BOOL "Building portaudio with SC" FORCE)
+        set(PORTAUDIO_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/external_libraries/portaudio/include )
+    endif()
+endif(WIN32)
+
+
 if(MSVC OR MINGW)
     set(MATH_LIBRARY "")
 else()
@@ -244,9 +273,10 @@ if (CMAKE_COMPILER_IS_INTEL AND NOT WIN32)
 	add_definitions(-diag-disable 279) # controlling expression is constant
 endif()
 
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC)
   foreach(flag CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
     set(${flag} "${${flag}} /wd4018") # signed/unsigned mismatch
+    set(${flag} "${${flag}} /wd4065") # switch statement contains 'default' but no 'case' labels
     set(${flag} "${${flag}} /wd4102") # unreferenced label
     set(${flag} "${${flag}} /wd4267") # conversion from 'size_t' to 'int', possible loss of data
     set(${flag} "${${flag}} /wd4244") # conversion from '__int64' to 'int', possible loss of data

HelpSource/Guides/HID_permissions.schelp

@@ -1,6 +1,6 @@
 title:: HID permissions
 summary:: Details how to configure your computer to set the permissions to access HID's
-categories:: External control>HID
+categories:: External Control>HID
 related:: Guides/Working_with_HID, Classes/HID
 
 section:: On Linux
@@ -27,4 +27,4 @@ Check the permissions with:
 
 code::
 "ls /dev/hidraw* -lah".unixCmd;
-::
+::

HelpSource/Guides/LID_permissions.schelp

@@ -1,6 +1,6 @@
 title:: LID permissions
 summary:: Details how to configure your computer to set the permissions to access LID's
-categories:: External control>HID
+categories:: External Control>HID
 related:: Guides/HID_permissions, Classes/LID
 
 section:: On Linux
@@ -27,4 +27,4 @@ Check the permissions with:
 
 code::
 "ls /dev/input/event* -lah".unixCmd;
-::
+::

HelpSource/Guides/Working_with_HID.schelp

@@ -1,6 +1,6 @@
 title:: Working with HID
 summary:: A guide to using HID devices for control input
-categories:: External control>HID
+categories:: External Control>HID
 related:: Classes/HID, Classes/HIDFunc
 
 section:: Introduction
@@ -218,4 +218,4 @@ Tdef( 'tryOpenHID' , {
 } );
 );
 Tdef( 'tryOpenHID' ).play;
-::
+::

QtCollider/primitives/prim_misc.cpp

@@ -167,7 +167,14 @@ QC_LANG_PRIMITIVE( Qt_SetGlobalPalette, 1, PyrSlot *r, PyrSlot *a, VMGlobals *g
 {
   if( !QcApplication::compareThread() ) return QtCollider::wrongThreadError();
 
-  QPalette p = QtCollider::get( a );
+  // The line below is a workaround. The non-win term causes Error C2440 in VS
+  // https://msdn.microsoft.com/en-us/library/sy5tsf8z.aspx
+  #if defined(_MSC_VER)
+    QPalette p = (QPalette&&) QtCollider::get(a);
+  #else
+    QPalette p = QtCollider::get( a );
+  #endif
+
   QApplication::setPalette( p );
 
   return errNone;

QtCollider/style/ProxyStyle.cpp

@@ -2,6 +2,7 @@
 
 #include "../QcApplication.h"
 
+#include <QtGlobal>
 #include <QWebView>
 #include <QStyleOptionSlider>
 #include <QPainter>
@@ -13,13 +14,13 @@
 using namespace QtCollider;
 
 static bool AlwaysShowScrollbars() {
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC)
   return QtCollider::Mac::AlwaysShowScrollbars();
 
-#elif Q_OS_X11
+#elif defined(Q_OS_X11)
   return !QcApplication::SystemHasMouseWheel();
 
-#elif Q_OS_WIN
+#elif defined(Q_OS_WIN)
   return !QcApplication::SystemHasMouseWheel();
 
 #else
@@ -43,7 +44,7 @@ void ProxyStyle::drawComplexControl ( ComplexControl ctrl, const QStyleOptionCom
     QProxyStyle::drawComplexControl( ctrl, &opt2, p, w );
     return;
   }
-  
+
   if (ctrl == QStyle::CC_ScrollBar && AlwaysShowScrollbars()) {
     const QStyleOptionSlider *optSlider = static_cast<const QStyleOptionSlider*>(opt);
     QStyleOptionSlider opt2( *optSlider );