diff --git a/msys2/etc/post-install/09-proxspace.post b/msys2/etc/post-install/09-proxspace.post new file mode 100644 index 000000000..1ae6d096f --- /dev/null +++ b/msys2/etc/post-install/09-proxspace.post @@ -0,0 +1,16 @@ +maybe_proxspace () +{ + if [ ! -d /mingw64/include/readline ] && [ "$MSYSTEM" == "MINGW64" ]; then + + wget https://github.com/Gator96100/ProxSpace-Repo/raw/master/mingw-w64-x86_64-gcc-libs-8.2.0-1-any.pkg.tar.xz https://github.com/Gator96100/ProxSpace-Repo/raw/master/mingw-w64-x86_64-gcc-8.2.0-1-any.pkg.tar.xz + pacman --noconfirm -U mingw-w64-x86_64-gcc-libs-8.2.0-1-any.pkg.tar.xz mingw-w64-x86_64-gcc-8.2.0-1-any.pkg.tar.xz + rm mingw-w64-x86_64-gcc-*.tar.xz + pacman --noconfirm -S mingw-w64-x86_64-readline mingw-w64-x86_64-qt5 git make pkg-config + fi + + if [ ! -d /mingw32/include/readline ] && [ "$MSYSTEM" == "MINGW32" ]; then + pacman --noconfirm -S mingw-w64-i686-gcc mingw-w64-i686-readline mingw-w64-i686-qt5 git make pkg-config + fi +} + +maybe_proxspace diff --git a/msys2/etc/profile b/msys2/etc/profile index 4da30f483..ba020e479 100644 --- a/msys2/etc/profile +++ b/msys2/etc/profile @@ -48,7 +48,6 @@ unset MINGW_MOUNT_POINT . '/etc/msystem' case "${MSYSTEM}" in MINGW32) - REQUIREDPACKAGE="mingw-w64-i686-gcc mingw-w64-i686-readline mingw-w64-i686-qt5 git make pkg-config" MINGW_MOUNT_POINT="${MINGW_PREFIX}" PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}" PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig" @@ -162,8 +161,6 @@ if [ "$MAYBE_FIRST_START" = "true" ]; then then sh /usr/bin/update-ca-trust fi - - pacman --noconfirm -S $REQUIREDPACKAGE clear echo diff --git a/runme64.bat b/runme64.bat new file mode 100644 index 000000000..701ad5ea1 --- /dev/null +++ b/runme64.bat @@ -0,0 +1,13 @@ +@echo off +REM ******************************************* +REM CHANGE THIS PATH TO MATCH YOUR INSTALLATION +REM ******************************************* +set MYPATH=%~dp0 +set autobuild=false + +echo # For a description of the file format, see the Users Guide >msys2/etc/fstab +echo # http://cygwin.com/cygwin-ug-net/using.html#mount-table >>msys2/etc/fstab +echo none / cygdrive binary,posix=0,noacl,user 0 0 >>msys2/etc/fstab +echo %MYPATH%pm3 /pm3 ntfs noacl 0 0 >>msys2/etc/fstab +echo %MYPATH%gcc-arm-none-eabi /gcc-arm-none-eabi ntfs noacl 0 0 >>msys2/etc/fstab +msys2\msys2_shell.cmd -mingw64 -defterm \ No newline at end of file