External - update sp-midi to 0f0afc2

This removes a dependency on JUCE and enables multiple simultaneous and identical controllers to be used on macOS

Author: samaaron

app/external/sp_midi/CMakeLists.txt

@@ -11,26 +11,29 @@ if(NOT MSVC)
     endif(APPLE)
 endif(NOT MSVC)
 
+
+# If we need to change something based on this running on CI, we can use if(DEFINED ENV{GITHUB_ACTION})
 if(APPLE)
     set(ERLANG_INCLUDE_PATH "/usr/local/lib/erlang/usr/include" CACHE PATH "Path to erlang includes")
 elseif(UNIX)
     set(ERLANG_INCLUDE_PATH "/usr/lib/erlang/usr/include" CACHE PATH "Path to erlang includes")
     find_package(ALSA REQUIRED)
 elseif(MSVC)
-    set(ERLANG_INCLUDE_PATH "C:/Program Files/erl-23.0/usr/include" CACHE PATH "Path to erlang includes")
+    if(DEFINED ENV{GITHUB_ACTION})
+        set(ERLANG_INCLUDE_PATH "C:/Program Files/erl10.7/usr/include" CACHE PATH "Path to erlang includes")
+    else()
+        set(ERLANG_INCLUDE_PATH "C:/Program Files/erl-23.0/usr/include" CACHE PATH "Path to erlang includes")
+    endif()
 endif(APPLE)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-#set(oscpack_path ${PROJECT_SOURCE_DIR}/external_libs/oscpack_1_1_0)
-#add_subdirectory(${oscpack_path})
-
 if(WIN32)
- include_directories( ${PROJECT_SOURCE_DIR}/external_libs/spdlog-0.11.0/include JuceLibraryCode JuceLibraryCode/modules ${PROJECT_SOURCE_DIR}/external_libs/cxxopts ${PROJECT_SOURCE_DIR}/external_libs)
+ include_directories( ${PROJECT_SOURCE_DIR}/external_libs/spdlog-1.8.2/include ${PROJECT_SOURCE_DIR}/external_libs/concurrentqueue ${PROJECT_SOURCE_DIR}/external_libs)
 elseif(APPLE)
- include_directories( ${PROJECT_SOURCE_DIR}/external_libs/spdlog-0.11.0/include JuceLibraryCode JuceLibraryCode/modules ${PROJECT_SOURCE_DIR}/external_libs/cxxopts ${PROJECT_SOURCE_DIR}/external_libs)
+ include_directories( ${PROJECT_SOURCE_DIR}/external_libs/spdlog-1.8.2/include ${PROJECT_SOURCE_DIR}/external_libs/concurrentqueue ${PROJECT_SOURCE_DIR}/external_libs)
 else()
- include_directories(${PROJECT_SOURCE_DIR}/external_libs/spdlog-0.11.0/include JuceLibraryCode JuceLibraryCode/modules ${PROJECT_SOURCE_DIR}/external_libs/cxxopts)
+ include_directories(${PROJECT_SOURCE_DIR}/external_libs/spdlog-1.8.2/include ${PROJECT_SOURCE_DIR}/external_libs/concurrentqueue)
 endif()
 
 set(sp_midi_sources
@@ -52,20 +55,8 @@ if(APPLE)
     add_definitions(-D__MACOSX_CORE__)
 endif(APPLE)
 
-if(APPLE)
-    set(juce_sources
-        JuceLibraryCode/include_juce_core.mm
-        JuceLibraryCode/include_juce_events.mm
-    )
-else(APPLE)
-    set(juce_sources
-        JuceLibraryCode/include_juce_core.cpp
-        JuceLibraryCode/include_juce_events.cpp
-    )
-endif(APPLE)
-
 # sp_midi_sources
-add_library(libsp_midi SHARED ${sp_midi_sources} ${juce_sources})
+add_library(libsp_midi SHARED ${sp_midi_sources})
 SET_TARGET_PROPERTIES(libsp_midi PROPERTIES PREFIX "")
 
 #check if armv7l architecture (Raspberry Pi OS 32bit) and add atomic linking if so
@@ -74,25 +65,23 @@ if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "armv7l")
     target_link_libraries(libsp_midi atomic)
 endif()
 
-add_definitions(-DJUCE_ALSA_MIDI_NAME="sp_midi")
-add_definitions(-DJUCE_APP_CONFIG_HEADER="AppConfig.h")
-
 if(MSVC)
-    add_definitions(-D_WIN32_WINNT=0x0600 -DJUCER_VS2015_78A5022=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000)
+    add_definitions(-D_WIN32_WINNT=0x0600)
     include_directories(${ERLANG_INCLUDE_PATH})
     target_link_libraries(libsp_midi winmm)
-    # example test exe. Only under Windows, because on the others, the NIF functions are resolved when linked to the erlnag VM, not on the library
+    # example test exe. Only under Windows, because on the others, the NIF functions are resolved when linked to the erlang VM, not on the library
     add_executable(sp_midi_test src/sp_midi_test.c)
     target_link_libraries(sp_midi_test libsp_midi)
 elseif(APPLE)
-    add_definitions(-DNDEBUG=1 -DJUCER_XCODE_MAC_F6D2F4CF=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000)
+    add_definitions(-DNDEBUG=1)
     include_directories(${ERLANG_INCLUDE_PATH})
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined suppress -flat_namespace")
     set_target_properties(libsp_midi PROPERTIES XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME "NO")
 #    set(CMAKE_EXE_LINKER_FLAGS "-framework CoreMIDI -framework CoreAudio -framework CoreFoundation -framework Accelerate -framework QuartzCore -framework AudioToolbox -framework IOKit -framework DiscRecording -framework Cocoa")
     target_link_libraries(libsp_midi "-framework CoreMIDI -framework CoreAudio -framework CoreFoundation -framework Accelerate -framework QuartzCore -framework AudioToolbox -framework IOKit -framework DiscRecording -framework Cocoa")
 elseif(UNIX)
-    add_definitions(-DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000)
+    add_definitions(-DLINUX=1 -DNDEBUG=1)
     include_directories(${ERLANG_INCLUDE_PATH})
     target_link_libraries(libsp_midi pthread ${ALSA_LIBRARY} dl rtmidi)
 endif(MSVC)
+

app/external/sp_midi/INSTALL.md

@@ -19,7 +19,7 @@ Don't know yet...
 * go to the root directory where you have the sp_midi sources (probably where this file is)
 * create `build` directory, and get into it (`mkdir build`, and then `cd build`)
 * It is normally enough to do `cmake ..`. If cmake complains about not finding a library make sure that it is installed.
-* On Linux, if cmake was succesful then it created the necessary Makefiles. Do `make`, and that will compile the code and create the binaries.
+* On Linux, if cmake was successful then it created the necessary Makefiles. Do `make`, and that will compile the code and create the binaries.
 * On Windows, if cmake was successful then it created the necessary Visual Studio solution and Project files. Open the `sp_midi.sln` file, and Build normally to create the binaries.