Merge pull request supercollider#56 from hzulla/stk-as-a-submodule

STK as a git submodule in libs/stk

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "libs/nova-simd"]
 	path = libs/nova-simd
 	url = git://github.com/timblechmann/nova-simd.git
-[submodule "source/StkInst/stk"]
-	path = source/StkInst/stk
+[submodule "libs/stk"]
+	path = libs/stk
 	url = https://github.com/thestk/stk.git

CMakeLists.txt

@@ -2,9 +2,16 @@ cmake_minimum_required (VERSION 2.8)
 project (sc3-plugins)
 
 if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libs/nova-simd/simd_memory.hpp)
-        message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
+  message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
 endif()
 
+if (NOT SYSTEM_STK)
+  if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libs/stk/include/Stk.h)
+    message(FATAL_ERROR "stk submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
+  endif()
+endif()
+
+
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules
                       ${CMAKE_MODULE_PATH})
 

source/CMakeLists.txt

@@ -269,23 +269,30 @@ if(SYSTEM_STK)
     find_package(STK)
     add_definitions(-DSYSTEM_STK)
     include_directories(${STK_INCLUDE_DIR})
+    if (EXISTS ${STK_INCLUDE_DIR}/SKINI.msg)
+      add_definitions(-DSTK_SKINIMSG)
+    else()
+      if (NOT EXISTS ${STK_INCLUDE_DIR}/SKINImsg.h)
+        message(FATAL_ERROR "Your system's stk library headers are missing the SKINI msg include file. Please read Debian Bug #805549 for more information & a fix. Alternatively, you can build the sc3 plugins without SYSTEM_STK using the included stk library.")
+      endif()
+    endif()
     BUILD_PLUGIN(StkUGens "StkUGens/StkAll.cpp" ${STK_LIBRARY} "StkUGens")
     add_subdirectory(StkInst)
 else()
     add_subdirectory(StkInst)
-    file(GLOB STKSources "StkUGens/stk-4.4.4/src/*.cpp")
-    file(GLOB UnneededSTKSources "StkUGens/stk-4.4.4/src/Rt*.cpp"
-                             "StkUGens/stk-4.4.4/src/Inet*.cpp"
-                             "StkUGens/stk-4.4.4/src/Socket.cpp"
-                             "StkUGens/stk-4.4.4/src/Tcp*.cpp"
-                             "StkUGens/stk-4.4.4/src/UdpSocket.cpp"
-                             "StkUGens/stk-4.4.4/src/Thread.cpp"
-                             "StkUGens/stk-4.4.4/src/Mutex.cpp"
+    file(GLOB STKSources "../libs/stk/src/*.cpp")
+    file(GLOB UnneededSTKSources "../libs/stk/src/Rt*.cpp"
+                             "../libs/stk/src/Inet*.cpp"
+                             "../libs/stk/src/Socket.cpp"
+                             "../libs/stk/src/Tcp*.cpp"
+                             "../libs/stk/src/UdpSocket.cpp"
+                             "../libs/stk/src/Thread.cpp"
+                             "../libs/stk/src/Mutex.cpp"
     )
     list(REMOVE_ITEM STKSources ${UnneededSTKSources})
-    include_directories(StkUGens/stk-4.4.4)
-    include_directories(StkUGens/stk-4.4.4/include)
-    include_directories(StkUGens/stk-4.4.4/src/include)
+    include_directories(../libs/stk)
+    include_directories(../libs/stk/include)
+    include_directories(../libs/stk/src/include)
     BUILD_PLUGIN(StkUGens "StkUGens/StkAll.cpp;${STKSources}" "" "StkUGens")
 endif()
 

source/StkInst/CMakeLists.txt

@@ -5,9 +5,9 @@ project (${PROJECT})
 include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
 
 if(NOT SYSTEM_STK)
-    set(STKDIR ${CMAKE_CURRENT_SOURCE_DIR}/stk)
+    set(STKDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/stk)
 
-    if(NOT EXISTS ${STKDIR}/src)
+    if(NOT EXISTS ${STKDIR}/include/Stk.h)
        message(FATAL_ERROR "Should use git submodule update and git submodule init to get Stk")
     endif()
 
@@ -21,7 +21,6 @@ if(NOT SYSTEM_STK)
                              "${STKDIR}/src/Mutex.cpp"
                              "${STKDIR}/src/Messager.cpp"
     )
-    #message(WARNING ${STKSources})
     list(REMOVE_ITEM STKSources ${UnneededSTKSources})
     include_directories(${STKDIR})
     include_directories(${STKDIR}/include)
@@ -85,5 +84,5 @@ endif()
 
 install(DIRECTORY "sc/" DESTINATION "${INSTALL_DESTINATION_DISTRO}/${PROJECT}" PATTERN "*")
 if(NOT SYSTEM_STK)
-    install(DIRECTORY "stk/rawwaves/" DESTINATION "${INSTALL_DESTINATION_DISTRO}/${PROJECT}/rawwaves" PATTERN "*.raw")
+    install(DIRECTORY "${STKDIR}/rawwaves/" DESTINATION "${INSTALL_DESTINATION_DISTRO}/${PROJECT}/rawwaves" PATTERN "*.raw")
 endif()

source/StkInst/StkInst.cpp

@@ -3,34 +3,34 @@ InterfaceTable *ft;
 World * gWorld;
 
 // STK Instrument Classes
-#include "Clarinet.h"
-#include "BlowHole.h"
-#include "Saxofony.h"
-#include "Flute.h"
-#include "Brass.h"
-#include "BlowBotl.h"
-#include "Bowed.h"
-#include "Plucked.h"
-#include "StifKarp.h"
-#include "Sitar.h"
-#include "Mandolin.h"
-#include "Rhodey.h"
-#include "Wurley.h"
-#include "TubeBell.h"
-#include "HevyMetl.h"
-#include "PercFlut.h"
-#include "BeeThree.h"
-#include "FMVoices.h"
-#include "VoicForm.h"
-#include "Moog.h"
-#include "Simple.h"
-#include "Drummer.h"
-#include "BandedWG.h"
-#include "Shakers.h"
-#include "ModalBar.h"
-#include "Mesh2D.h"
-#include "Resonate.h"
-#include "Whistle.h"
+#include <Clarinet.h>
+#include <BlowHole.h>
+#include <Saxofony.h>
+#include <Flute.h>
+#include <Brass.h>
+#include <BlowBotl.h>
+#include <Bowed.h>
+#include <Plucked.h>
+#include <StifKarp.h>
+#include <Sitar.h>
+#include <Mandolin.h>
+#include <Rhodey.h>
+#include <Wurley.h>
+#include <TubeBell.h>
+#include <HevyMetl.h>
+#include <PercFlut.h>
+#include <BeeThree.h>
+#include <FMVoices.h>
+#include <VoicForm.h>
+#include <Moog.h>
+#include <Simple.h>
+#include <Drummer.h>
+#include <BandedWG.h>
+#include <Shakers.h>
+#include <ModalBar.h>
+#include <Mesh2D.h>
+#include <Resonate.h>
+#include <Whistle.h>
 
 /*
 void* operator new (unsigned int size)
@@ -418,4 +418,4 @@ PluginLoad(StkUnit){
     DefineDtorUnit(StkInst);
     DefineDtorUnit(StkMesh2D);
     DefineSimpleUnit(StkGlobals);
-}
+}

source/StkUGens/StkAll.cpp

@@ -3,10 +3,12 @@
 #define MY_FLOAT float
 
 #include <Skini.h>  // caps
-#ifdef SYSTEM_STK
+#ifdef STK_SKINIMSG
+	// STK up to release version 4.5.0
 	#include <SKINI.msg>
 #else
-	#include "include/SKINI.msg"
+	// later versions of STK
+	#include <SKINImsg.h>
 #endif
 
 #include <OneZero.h>
@@ -20,7 +22,7 @@
 #include <BandedWG.h>
 #include <BeeThree.h>
 #include <BlowHole.h>
-#include <Bowed.h> // caps
+#include <Bowed.h>
 #include <Clarinet.h>
 #include <Flute.h>
 #include <ModalBar.h>