Revert install fluidsynth library and fetch more required dependencies

maron2000 · Oct 7, 2023 · c9dc7ef · c9dc7ef
1 parent 3dc4cb2
commit c9dc7ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -62,6 +62,25 @@ jobs:
                 #cp ${FILE} x86_64/$i #currently searches arm64 directory regardless of platform
             fi
           done
+          cd arm64 #currently libraries are saved in this directory regardless of platform
+          for ((loop=0;loop<3;loop++)) # better to make this recursively
+          do
+              for LIBS in *.dylib # fetch more dependencies required  
+              do
+                  INSTALL_LIBS=($(otool -L $LIBS | grep '\w*/usr/local/.*' - | sed -n -r 's#.+/(lib.*dylib).*#\1#p')) 
+                  for i in ${INSTALL_LIBS[@]}
+                  do
+                      j=($(echo $i | sed -E 's|([^¥.^¥-]+).*dylib|\1|p'))
+                      FILE=($(find -H /usr/local/** -name $j*.*.dylib 2>/dev/null))
+                      if [ ! -z $FILE ]
+                      then
+                          echo ${FILE}
+                          cp -n ${FILE} $i 2>/dev/null
+                          #cp -n ${FILE} $i 2>/dev/null #currently searches arm64 directory regardless of platform
+                      fi
+                  done
+              done
+          done
           cd $top
           mv dosbox-x.app $top/package/dosbox-x
           cd $top/package/dosbox-x/dosbox-x.app/Contents/MacOS/

diff --git a/build-macos b/build-macos
@@ -69,7 +69,7 @@ fi
 for arch in ${architectures}; do
     declare brew_cmd="${arch}_brew_cmd"
     if [ -n "${!brew_cmd}" ]; then
-        #${!brew_cmd} list fluid-synth &>/dev/null || ${!brew_cmd} install fluid-synth
+        ${!brew_cmd} list fluid-synth &>/dev/null || ${!brew_cmd} install fluid-synth
         ${!brew_cmd} list libslirp &>/dev/null || ${!brew_cmd} install libslirp
         ${!brew_cmd} list pkg-config &>/dev/null || ${!brew_cmd} install pkg-config
     fi

diff --git a/build-macos-sdl2 b/build-macos-sdl2
@@ -65,7 +65,7 @@ fi
 for arch in ${architectures}; do
     declare brew_cmd="${arch}_brew_cmd"
     if [ -n "${!brew_cmd}" ]; then
-        #${!brew_cmd} list fluid-synth &>/dev/null || ${!brew_cmd} install fluid-synth
+        ${!brew_cmd} list fluid-synth &>/dev/null || ${!brew_cmd} install fluid-synth
         ${!brew_cmd} list libslirp &>/dev/null || ${!brew_cmd} install libslirp
         ${!brew_cmd} list pkg-config &>/dev/null || ${!brew_cmd} install pkg-config
     fi