Skip to content
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

Support Qt6 only. #397

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Support Qt6 only. #397

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
30 changes: 5 additions & 25 deletions build_config.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,23 @@ echo ************************************

echo *** Setting up environment ***

REM Currently supported combinations by Qt installation
REM 5.12.12 msvc2015,msvc2017
REM 5.15.2 msvc2015,msvc2019
REM 6.2.2 msvc2019

if "%QTVER%"=="" (
REM set QTVER=5.12.12
set QTVER=5.15.2
REM set QTVER=6.4.1
REM set QTVER=6.2.2
REM set QTVER=6.4.3
REM set QTVER=6.5.3
set QTVER=6.6.1
)

if "%MSVC_VER%"=="" (
REM set MSVC_VER=2015
REM set MSVC_VER=2017
set MSVC_VER=2019
)

if "%MSVC_VER%"=="2015" (
if "%MSVC_DIR%"=="" set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC"
) else (
if exist "C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\Enterprise\VC\Auxiliary\Build" (
if "%MSVC_DIR%"=="" set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\Enterprise\VC\Auxiliary\Build"
) else (
if "%MSVC_DIR%"=="" set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\BuildTools\VC\Auxiliary\Build"
)
if "%MSVC_DIR%"=="" (
set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\BuildTools\VC\Auxiliary\Build"
)

echo Set QT directory for %QTVER% and %MSVC_VER%
if "%QTDIR%"=="" (
set QTDIR=C:\Qt\%QTVER%\msvc%MSVC_VER%_64
)

if "%QWT%"=="" (
set QWT=6.1.4
REM set QWT=6.1.6
REM set QWT=6.2.0
)

set PATH=%QTDIR%\bin;%MSVC_DIR%;%PATH%
0 build_parser_windows_qt5_MSVC.bat → build_parser_windows_MSVC.bat
View file
Open in desktop
File renamed without changes.
125 changes: 0 additions & 125 deletions build_qwt_windows_qt5_MSVC.bat
View file
Open in desktop

This file was deleted.

0 build_sdk_windows_qt5_MSVC.bat → build_sdk_windows_MSVC.bat
View file
Open in desktop
File renamed without changes.
0 build_sdk_windows_qt5_MSVC_cmake.bat → build_sdk_windows_MSVC_cmake.bat
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...dk_windows_qt5_MSVC_cmake_interactive.bat → build_sdk_windows_MSVC_cmake_interactive.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
call build_sdk_windows_qt5_MSVC_cmake.bat
call build_sdk_windows_MSVC_cmake.bat
SET RETCODE=%ERRORLEVEL%
set /p name= Continue
exit /b %RETCODE%
2 changes: 1 addition & 1 deletion build_sdk_windows_qt5_MSVC_interactive.bat → build_sdk_windows_MSVC_interactive.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
call build_sdk_windows_qt5_MSVC.bat
call build_sdk_windows_MSVC.bat
SET RETCODE=%ERRORLEVEL%
set /p name= Continue
exit /b %RETCODE%
Loading