From 2620d688ec7e1ef5fba00a9c0bff0ddab3176d47 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Mon, 15 Nov 2021 18:04:57 +0100 Subject: [PATCH] More MacOS work 6 --- macos/set_library_path.sh | 2 -- make_macos_dotapp.sh | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/macos/set_library_path.sh b/macos/set_library_path.sh index 83e472b..a92d869 100644 --- a/macos/set_library_path.sh +++ b/macos/set_library_path.sh @@ -14,7 +14,5 @@ get_first_arg() { # Get current path CURRENT_PATH=$(get_first_arg $(otool -L $EXEC | grep $WANTED_LIB)) -echo "Current path for" $WANTED_LIB "in" $EXEC ":" $CURRENT_PATH - # Change to the new path install_name_tool -change $CURRENT_PATH $NEW_PATH $EXEC \ No newline at end of file diff --git a/make_macos_dotapp.sh b/make_macos_dotapp.sh index 503c2ec..43611e0 100644 --- a/make_macos_dotapp.sh +++ b/make_macos_dotapp.sh @@ -28,19 +28,19 @@ LIBGLFW_PATH=$(sh macos/get_library_path.sh libglfw $DOTAPP/Contents/MacOS/sdrpp LIBVOLK_PATH=$(sh macos/get_library_path.sh libvolk $DOTAPP/Contents/MacOS/sdrpp) # Modify path for sdrpp -sh macos/set_library_path.sh libglew @rpath/libglew.dylib $DOTAPP/Contents/MacOS/sdrpp +sh macos/set_library_path.sh libGLEW @rpath/libGLEW.dylib $DOTAPP/Contents/MacOS/sdrpp sh macos/set_library_path.sh libfftw3f @rpath/libfftw3f.dylib $DOTAPP/Contents/MacOS/sdrpp sh macos/set_library_path.sh libglfw @rpath/libglfw.dylib $DOTAPP/Contents/MacOS/sdrpp sh macos/set_library_path.sh libvolk @rpath/libvolk.dylib $DOTAPP/Contents/MacOS/sdrpp # Modify path for libsdrpp_core -sh macos/set_library_path.sh libglew @rpath/libglew.dylib $DOTAPP/Contents/Frameworks/libsdrpp_core.dylib +sh macos/set_library_path.sh libGLEW @rpath/libGLEW.dylib $DOTAPP/Contents/Frameworks/libsdrpp_core.dylib sh macos/set_library_path.sh libfftw3f @rpath/libfftw3f.dylib $DOTAPP/Contents/Frameworks/libsdrpp_core.dylib sh macos/set_library_path.sh libglfw @rpath/libglfw.dylib $DOTAPP/Contents/Frameworks/libsdrpp_core.dylib sh macos/set_library_path.sh libvolk @rpath/libvolk.dylib $DOTAPP/Contents/Frameworks/libsdrpp_core.dylib # Copy deps -cp $LIBGLEW_PATH $DOTAPP/Contents/Frameworks/libglew.dylib +cp $LIBGLEW_PATH $DOTAPP/Contents/Frameworks/libGLEW.dylib cp $LIBFFTW3F_PATH $DOTAPP/Contents/Frameworks/libfftw3f.dylib cp $LIBGLFW_PATH $DOTAPP/Contents/Frameworks/libglfw.dylib cp $LIBVOLK_PATH $DOTAPP/Contents/Frameworks/libvolk.dylib