github/ProxSpace
1
0
Fork 0
mirror of https://github.com/Gator96100/ProxSpace.git synced 2025-08-20 21:33:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for x86-64

Browse source
This commit is contained in:
Gator96100 2018-07-30 18:24:30 +02:00
commit 825f448585
3 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
msys2/etc/post-install/09-proxspace.post Normal file
View file

@ -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

3
msys2/etc/profile
View file

@ -48,7 +48,6 @@ unset MINGW_MOUNT_POINT
. '/etc/msystem' . '/etc/msystem'
case "${MSYSTEM}" in case "${MSYSTEM}" in
MINGW32) MINGW32)
REQUIREDPACKAGE="mingw-w64-i686-gcc mingw-w64-i686-readline mingw-w64-i686-qt5 git make pkg-config"
MINGW_MOUNT_POINT="${MINGW_PREFIX}" MINGW_MOUNT_POINT="${MINGW_PREFIX}"
PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}" PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig" PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig"
@ -163,8 +162,6 @@ if [ "$MAYBE_FIRST_START" = "true" ]; then
sh /usr/bin/update-ca-trust sh /usr/bin/update-ca-trust
fi fi
pacman --noconfirm -S $REQUIREDPACKAGE
clear clear
echo echo
echo echo

13
runme64.bat Normal file
View file

@ -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