#3454 wxwidgets 3.2 macOS

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 3aeb2c16ede84d5838ebd1801f83b5e0ad60acd1..1190a21a6f033dc314a0813b259a5e55b6147691 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -245,20 +245,60 @@ $(eval $cmd)
 
          echo "   if [ \`getDistrib\` == MacOS ] ; then ">> $filename_BinVersion 
          echo "        cd creatoolsTPLaux/lib" >>  $filename_BinVersion
-         echo "        ln -s libwx_baseu-3.0.0.5.0.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
-         echo "        ln -s libwx_osx_cocoau_adv-3.0.0.5.0.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
-         echo "        ln -s libwx_osx_cocoau_aui-3.0.0.5.0.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
-         echo "        ln -s libwx_osx_cocoau_core-3.0.0.5.0.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
-         echo "        ln -s libwx_osx_cocoau_gl-3.0.0.5.0.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
-         echo "        ln -s libwx_osx_cocoau_html-3.0.0.5.0.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
+# wxWidgets 3.0
+#        echo "        ln -s libwx_baseu-3.0.0.5.0.dylib           libwx_baseu-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_adv-3.0.0.5.0.dylib  libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_aui-3.0.0.5.0.dylib  libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_core-3.0.0.5.0.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_gl-3.0.0.5.0.dylib   libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_html-3.0.0.5.0.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
+
+# wxWidgets 3.2 // El Capitan
+         echo "        ln -s libwx_baseu-3.1.5.5.0.dylib           libwx_baseu-3.1.dylib" >>  $filename_BinVersion
+         echo "        ln -s libwx_osx_cocoau_adv-3.1.5.5.0.dylib  libwx_osx_cocoau_adv-3.1.dylib" >>  $filename_BinVersion
+         echo "        ln -s libwx_osx_cocoau_aui-3.1.5.5.0.dylib  libwx_osx_cocoau_aui-3.1.dylib" >>  $filename_BinVersion
+         echo "        ln -s libwx_osx_cocoau_core-3.1.5.5.0.dylib libwx_osx_cocoau_core-3.1.dylib" >>  $filename_BinVersion
+         echo "        ln -s libwx_osx_cocoau_gl-3.1.5.5.0.dylib   libwx_osx_cocoau_gl-3.1.dylib" >>  $filename_BinVersion
+         echo "        ln -s libwx_osx_cocoau_html-3.1.5.5.0.dylib libwx_osx_cocoau_html-3.1.dylib" >>  $filename_BinVersion
+
+# wxWidgets 3.2 // El Sonoma
+#        echo "        ln -s libwx_baseu-3.2.0.5.0.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_adv-3.2.0.5.0.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_aui-3.2.0.5.0.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_core-3.2.0.5.0.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_gl-3.2.0.5.0.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
+#        echo "        ln -s libwx_osx_cocoau_html-3.2.0.5.0.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
+
+
+         
 #        echo "        ln -s libarchive.dylib libarchive.2.dylib" >>  $filename_BinVersion
          echo "        ACTUALDIRLINK=\$(pwd)" >>  $filename_BinVersion
-         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
-         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
-         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
-         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
-         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
-         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
+         
+# wxWidgets 3.0
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
+
+# wxWidgets 3.2 // El Capitan
+         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_baseu-3.1.dylib" >>  $filename_BinVersion
+         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_core-3.1.dylib" >>  $filename_BinVersion
+         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_adv-3.1.dylib" >>  $filename_BinVersion
+         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_html-3.1.dylib" >>  $filename_BinVersion
+         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_aui-3.1.dylib" >>  $filename_BinVersion
+         echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_gl-3.1.dylib" >>  $filename_BinVersion
+
+# wxWidgets 3.2 // El Sonoma
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_baseu-3.2.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_core-3.2.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_adv-3.2.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_html-3.2.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_aui-3.2.dylib" >>  $filename_BinVersion
+#        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_gl-3.2.dylib" >>  $filename_BinVersion
+
+         
          echo "        cd ../.." >>  $filename_BinVersion
          echo "   fi ">> $filename_BinVersion