Skip to content

Update build scripts to use official Qt 5.12.5 and mingw 7.3 on Windows for 32 and 64 bit #1876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
peterNordin wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update build scripts to use official Qt 5.12.5 and mingw 7.3 on Windows for 32 and 64 bit #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dependencies/setHopsanBuildPaths.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ if not "%hopsan_arch%"=="x86" (
REM Setup Default compiler and Qt paths
if "%hopsan_arch%"=="x86" (
REM These paths require the official Qt version from Qt.io (for 32-bit)
set mingw_path=C:\Qt\Tools\mingw492_32\bin
set qmake_path=C:\Qt\5.6.3\mingw49_32\bin
set mingw_path=C:\Qt\Tools\mingw730_32\bin
set qmake_path=C:\Qt\5.12.5\mingw73_32\bin
) else (
REM These paths require the custom build Qt library for Hopsan 64-bit
set mingw_path=C:\hopsan-dev\x86_64-4.9.4-release-posix-seh-rt_v5-rev0\mingw64\bin
set qmake_path=C:\hopsan-dev\qt-5.6.3-x64-mingw494-posix-seh-rt_v5-rev0\bin
set mingw_path=C:\Qt\Tools\mingw730_64\bin
set qmake_path=C:\Qt\5.12.5\mingw73_64\bin
)

REM Tool paths
Expand Down
3 changes: 1 addition & 2 deletions Dependencies/setupDiscount.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ REM Build with mingw patches

REM The first patch was taken from https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-discount
REM It was however modified to grep for Msys instead of MINGW (from uname -a)
bash.exe -c "patch -p0 < ../discount-mingw-building.patch; patch -p1 < ../discount-2.1.8-msys.patch; CC=gcc ./configure.sh --shared --prefix=%installdir_bash% --confdir=%installdir_bash%/etc; make -j4; make install"
REM Note! We use msys make here as mingw32-make is to strict since 4.9.2
bash.exe -c "patch -p0 < ../discount-mingw-building.patch; patch -p1 < ../discount-2.1.8-msys.patch; CC=gcc ./configure.sh --shared --prefix=%installdir_bash% --confdir=%installdir_bash%/etc; mingw32-make -j4; mingw32-make install"

cd %basedir%
echo.
Expand Down