mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update build-win32 and build-win64 to allow for different version of linkers

pull/224/head
root 2020-04-18 22:44:02 -05:00
rodzic 6f38127d27
commit 64c2bc27b3
2 zmienionych plików z 35 dodań i 8 usunięć

22
scripts/build-w32.sh
Wyświetl plik

@ -222,23 +222,35 @@ cp -a /usr/i686-w64-mingw32/lib/libwinpthread-1.dll ${ZIP_DIR}/bin/.
cp -a ${LIBUSB_1_0_BIN_PATH}/MinGW32/dll/libusb-1.0.dll ${ZIP_DIR}/bin/libusb-1.0.dll
# Required for MinGW with GCC 6.3
FILE= /usr/lib/gcc/i686-w64-mingw32/6.3-posix/libgcc_s_sjlj-1.dll
FILE="/usr/lib/gcc/i686-w64-mingw32/6.3-posix/libgcc_s_sjlj-1.dll"
if test -f "$FILE"; then
cp -a /usr/lib/gcc/i686-w64-mingw32/6.3-posix/libgcc_s_sjlj-1.dll ${ZIP_DIR}/bin/libgcc_s_sjlj-1.dll
cp -a ${FILE} ${ZIP_DIR}/bin/libgcc_s_sjlj-1.dll
fi
# Required for MinGW with GCC 8.3
FILE= /usr/lib/gcc/i686-w64-mingw32/8.3-posix/libgcc_s_sjlj-1.dll
FILE="/usr/lib/gcc/i686-w64-mingw32/8.3-posix/libgcc_s_sjlj-1.dll"
if test -f "$FILE"; then
cp -a ${FILE} ${ZIP_DIR}/bin/libgcc_s_sjlj-1.dll
fi
pushd .
cd ${ZIP_DIR}/lib/msvc/
## Need VC++ free toolkit installed (default Wine directory installation shown)
# Path for 2003 version of Visual C++ Toolkit
#( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files/Microsoft\ Visual\ C++\ Toolkit\ 2003/bin/link.exe /lib /machine:i386 /def:libhamlib-4.def )
#wine ~/.wine/drive_c/Program\ Files/Microsoft\ Visual\ C++\ Toolkit\ 2003/bin/link.exe /lib /machine:i386 /def:libhamlib-4.def
# Path for 2017 version of Visual Studio
( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files\ (x86)\/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x86/bin/link.exe /lib /machine:i386 /def:libhamlib-4.def )
wine ~/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x86/bin/link.exe /lib /machine:i386 /def:libhamlib-4.def
if [ $? -ne 0 ];then
echo Did not find 2017 link.exe...trying 2019
# Path for 2019 version Visual Studio Community
#( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files\ \(x86)\\/Microsoft\ Visual\ Studio\2019\Community\VC\Tools\MSVC\14.25.28610\bin\Hostx64\x86\bin\link.exe /lib /machine:i386 /def:libhamlib-4.def )
wine ~/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Tools/MSVC/14.25.28610/bin/Hostx64/x86/bin/link.exe /lib /machine:i386 /def:libhamlib-4.def
fi
if [ $? -ne 0 ]; then
echo Cannot find MSVC link executable!!
echo You must put in your own path in here
popd
exit 1
fi
popd
/usr/bin/zip -r ${HL_FILENAME}.zip `basename ${ZIP_DIR}`

21
scripts/build-w64.sh
Wyświetl plik

@ -234,14 +234,29 @@ if test -f "$FILE"; then
cp -a ${FILE} ${ZIP_DIR}/bin/libgcc_s_sjlj-1.dll
fi
## Need VC++ free toolkit installed (default Wine directory installation shown)
( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files/Microsoft\ Visual\ C++\ Toolkit\ 2003/bin/link.exe /lib /machine:amd64 /def:libhamlib-4.def )
pushd .
cd ${ZIP_DIR}/lib/msvc/
## Need VC++ free toolkit installed (default Wine directory installation shown)
# Path for 2003 version of Visual C++ Toolkit
wine ~/.wine/drive_c/Program\ Files/Microsoft\ Visual\ C++\ Toolkit\ 2003/bin/link.exe /lib /machine:amd64 /def:libhamlib-4.def
## Need VC++ free toolkit installed (default Wine directory installation shown)
# Path for 2003 version of Visual C++ Toolkit -- anybody have this anymore?
# Commented out 20200418
#( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files/Microsoft\ Visual\ C++\ Toolkit\ 2003/bin/link.exe /lib /machine:i386 /def:libhamlib-4.def )
if [ $? -ne 0 ];then
# Path for 2017 version of Visual Studio
( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files\ (x86)\/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x86/bin/link.exe /lib /machine:i386 /def:libhamlib-4.def )
fi
if [ $? -ne 0 ];then
echo Did not find 2017 link.exe...trying 2019
# Path for 2019 version Visual Studio Community
#( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files\ \(x86)\\/Microsoft\ Visual\ Studio\2019\Community\VC\Tools\MSVC\14.25.28610\bin\Hostx64\x86\bin\link.exe /lib /machine:i386 /def:libhamlib-4.def )
#else
echo Cannot find MSVC link executable!!
echo You must put in your own path in here
popd
exit 1
fi
popd
/usr/bin/zip -r ${HL_FILENAME}.zip `basename ${ZIP_DIR}`