Merge remote-tracking branch 'remotes/local/dev' into superslicer_variant

Author: supermerill

src/platform/osx/BuildMacOSImage.sh.in

@@ -77,21 +77,33 @@ done
         cp -f bin/@SLIC3R_APP_CMD@ pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
         chmod u+x pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
 
+        echo "otool -L exefile:"
+        otool -L pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
+        echo "END otool"
+        
         #copy libzstd
         ZSDT_FILE=
         echo "libzstd:\n"
         ls -al /opt/homebrew/opt/zstd/lib/libzstd*.dylib
         ls -al /usr/local/opt/zstd/lib/libzstd*.dylib
-        ZSDT_FILE=$(ls -v /usr/local/opt/zstd/lib/libzstd.1.*.dylib | tail -n 1)
+        ZSDT_PATH=$(ls -v /usr/local/opt/zstd/lib/libzstd.1.*.dylib | tail -n 1)
         if [ -z "${ZSDT_FILE}" ]
         then
             # try with homebrew
-            ZSDT_FILE=$(ls -v /opt/homebrew/opt/zstd/lib/libzstd.1.*.dylib | tail -n 1)
+            ZSDT_PATH=$(ls -v /opt/homebrew/opt/zstd/lib/libzstd.1.*.dylib | tail -n 1)
         fi
-        echo "zstd var:'"$ZSDT_FILE"' need to be renamed libzstd.1.dylib in Contents/Frameworks";
-        cp $ZSDT_FILE pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/Frameworks/libzstd.1.dylib
+        ZSTD_FILE=$(basename ${ZSDT_PATH})
+        echo "zstd var:'"$ZSDT_PATH"' : "$ZSTD_FILE;
+        cp $ZSDT_PATH pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/Frameworks/$ZSTD_FILE
         ls -al pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/Frameworks/
-
+        install_name_tool -change $ZSDT_PATH @executable_path/../Frameworks/$ZSTD_FILE pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
+        install_name_tool -change /opt/homebrew/opt/zstd/lib/libzstd.1.dylib @executable_path/../Frameworks/$ZSTD_FILE pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
+        install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib @executable_path/../Frameworks/$ZSTD_FILE pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
+        
+        echo "otool -L exefile now:"
+        otool -L pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
+        echo "END otool"
+        
 #     } &> $ROOT/Build.log # Capture all command output
     echo -e "\n ... done\n"