Squashed 'app/external/sp_midi/' changes from 6cdd94525..834fe552b

834fe552b Merge pull request #27 from sonic-pi-net/catch-sendMessage-exceptions
34d6cb763 Merge pull request #28 from sonic-pi-net/rtmidi-5
e4d31dd55 rtmidi - include BEAM v24 headers for Windows builds
e60fa869b CI - handle Erlang dep w/ same method used in Sonic Pi
d738b9565 External Libs - upgrade RtMidi to v5.0.0
94b3880c3 Update midiout.cpp
aea10f081 Remove hotplug thread and trigger refresh from erl (#26)

git-subtree-dir: app/external/sp_midi
git-subtree-split: 834fe552b13c5c1a196174989ea805720c65b62a

Author: samaaron

.github/workflows/cmake.yml

@@ -21,24 +21,35 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    
+
     - name: Fetch packages (Linux)
       if: runner.os == 'Linux'
       run: |
-        sudo apt-get update
-        sudo apt-get install libasound2-dev librtmidi-dev erlang-dev
+        sudo apt update
+        sudo apt install -y libasound2-dev librtmidi-dev
+
+    - name: Linux Elixir
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: '24'
+        elixir-version: '1.13'
+      if: matrix.os == 'ubuntu-latest'
 
-    - name: Fetch packages (Mac)
+    - name: Win Elixir
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: '24'
+        elixir-version: '1.13'
+      if: runner.os == 'Windows'
+
+    - name: Mac Elixir
       continue-on-error: true
       if: runner.os == 'macOS'
       run: |
         export HOMEBREW_NO_INSTALL_CLEANUP=1
         brew update
-        brew install erlang     
+        brew install elixir
 
-    - name: Fetch packages (Windows)
-      if: runner.os == 'Windows'
-      run: choco install erlang 
 
 #    - name: Setup tmate session
 #      if: runner.os == 'Windows'
@@ -55,8 +66,8 @@ jobs:
       # access regardless of the host operating system
       shell: bash
       working-directory: ${{github.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source 
-      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # Note the current convention is to use the -S and -B options here to specify source
+      # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 

CMakeLists.txt

@@ -19,11 +19,7 @@ elseif(UNIX)
     set(ERLANG_INCLUDE_PATH "/usr/lib/erlang/usr/include" CACHE PATH "Path to erlang includes")
     find_package(ALSA REQUIRED)
 elseif(MSVC)
-    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()
+    set(ERLANG_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/external_libs/rtmidi/windows/headers/erlang CACHE PATH "Path to erlang includes")
 endif(APPLE)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)