File tree 6 files changed +23
-21
lines changed
treefrog-setup/treefrog-setup 6 files changed +23
-21
lines changed Original file line number Diff line number Diff line change 4
4
::
5
5
:: Edit this line to run the batch file for Qt environment.
6
6
::
7
- :: call "C:\Qt\Qt5.9.3\5.9.3\mingw53_32\bin\qtenv2.bat"
8
- :: call "C:\Qt\Qt5.9.3\5.9.3\msvc2015_64\bin\qtenv2.bat"
9
- :: call "C:\Qt\Qt5.9.3\5.9.3\msvc2017_64\bin\qtenv2.bat"
10
- :: call "C:\Qt\Qt5.10.0\5.10.0\mingw53_32\bin\qtenv2.bat"
11
- call " C:\Qt\Qt5.10.0\5.10.0\msvc2015_64\bin\qtenv2.bat"
12
- :: call "C:\Qt\Qt5.10.0\5.10.0\msvc2017_64\bin\qtenv2.bat"
13
-
14
- call " C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
15
- :: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
7
+ :: call "C:\Qt\5.9.3\mingw53_32\bin\qtenv2.bat"
8
+ :: call "C:\Qt\5.9.3\msvc2015_64\bin\qtenv2.bat"
9
+ :: call "C:\Qt\5.9.3\msvc2017_64\bin\qtenv2.bat"
10
+ :: call "C:\Qt\5.10.0\mingw53_32\bin\qtenv2.bat"
11
+ :: call "C:\Qt\5.10.0\msvc2015_64\bin\qtenv2.bat"
12
+ call " C:\Qt\5.11.0\msvc2017_64\bin\qtenv2.bat"
13
+ :: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
14
+ call " C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
16
15
17
16
cd /D %~dp0
18
17
call compile_install.bat
Original file line number Diff line number Diff line change 5
5
::
6
6
7
7
set VERSION = 1.22.0
8
- set QTBASE = D :\Qt
8
+ set QTBASE = C :\Qt
9
9
set TFDIR = C:\TreeFrog\%VERSION%
10
10
11
11
set BASEDIR = %~dp0
12
12
set SLNFILE = %BASEDIR% \treefrog-setup\treefrog-setup.sln
13
13
cd %BASEDIR%
14
14
15
15
:: MinGW
16
- call :build_msi " %QTBASE% \Qt5.10.0\5.10.0\mingw53_32\bin\qtenv2.bat" 5.10
17
- call :build_msi " %QTBASE% \Qt5.9.3\5.9.3\mingw53_32\bin\qtenv2.bat" 5.9
16
+ call :build_msi " %QTBASE% \5.11.0\mingw53_32\bin\qtenv2.bat" 5.11
17
+ call :build_msi " %QTBASE% \5.10.1\mingw53_32\bin\qtenv2.bat" 5.10
18
+ :: call :build_msi "%QTBASE%\5.9.3\mingw53_32\bin\qtenv2.bat" 5.9
18
19
call :build_setup treefrog-%VERSION% -mingw-setup.exe
19
20
20
21
:: MSVC2017
21
22
call " C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
22
23
23
- call :build_msi " %QTBASE% \Qt5.10.0\5.10.0\msvc2017_64\bin\qtenv2.bat" 5.10
24
- call :build_msi " %QTBASE% \Qt5.9.3\5.9.3\msvc2017_64\bin\qtenv2.bat" 5.9
24
+ call :build_msi " %QTBASE% \5.11.0\msvc2017_64\bin\qtenv2.bat" 5.11
25
+ call :build_msi " %QTBASE% \5.10.1\msvc2017_64\bin\qtenv2.bat" 5.10
26
+ :: call :build_msi "%QTBASE%\5.9.3\msvc2017_64\bin\qtenv2.bat" 5.9
25
27
call :build_setup treefrog-%VERSION% -msvc2017_64-setup.exe
26
28
27
29
Original file line number Diff line number Diff line change @@ -160,7 +160,7 @@ namespace treefrogsetup {
160
160
this ->label ->Name = L" label" ;
161
161
this ->label ->Size = System::Drawing::Size (309 , 15 );
162
162
this ->label ->TabIndex = 4 ;
163
- this ->label ->Text = L" Specify a base folder of Qt version 5.9 or 5.10 ." ;
163
+ this ->label ->Text = L" Specify a base folder of Qt version 5.10 or 5.11 ." ;
164
164
//
165
165
// label1
166
166
//
@@ -171,7 +171,7 @@ namespace treefrogsetup {
171
171
this ->label1 ->Name = L" label1" ;
172
172
this ->label1 ->Size = System::Drawing::Size (162 , 15 );
173
173
this ->label1 ->TabIndex = 5 ;
174
- this ->label1 ->Text = L" Example: C:\\ Qt\\ Qt5.10.1 \\ 5.10.1 \\ msvc2017_64" ;
174
+ this ->label1 ->Text = L" Example: C:\\ Qt\\ 5.11.0 \\ msvc2017_64" ;
175
175
//
176
176
// labeltop
177
177
//
Original file line number Diff line number Diff line change @@ -18,10 +18,10 @@ LANGUAGE 17, SUBLANG_DEFAULT
18
18
// User resources
19
19
//
20
20
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
21
- IDR_TREEFROG_QT59_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.9 .msi"
21
+ IDR_TREEFROG_QT510_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.10 .msi"
22
22
23
23
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
24
- IDR_TREEFROG_QT510_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.10 .msi"
24
+ IDR_TREEFROG_QT511_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.11 .msi"
25
25
26
26
//
27
27
// String Table resources
Original file line number Diff line number Diff line change 17
17
#define IDR_TREEFROG_QT58_MSI 1058
18
18
#define IDR_TREEFROG_QT59_MSI 1059
19
19
#define IDR_TREEFROG_QT510_MSI 10510
20
+ #define IDR_TREEFROG_QT511_MSI 10511
Original file line number Diff line number Diff line change @@ -480,9 +480,9 @@ static void printSuccessMessage(const QString &model)
480
480
#else
481
481
msg = msg.arg (" " );
482
482
#endif
483
- msg += " \n or\n\n cmake:\n " ;
484
- msg += " Run `mkdir build; cd build; cmake ..` to generate a Makefile.\n " ;
485
- msg += " Run `cd build; make cmake` to regenerate the Makefile." ;
483
+ msg += " \n or\n\n cmake:\n " ;
484
+ msg += " Run `cd build; cmake ..` to generate a Makefile.\n " ;
485
+ msg += " Run `cd build; make cmake` to regenerate the Makefile." ;
486
486
}
487
487
488
488
putchar (' \n ' );
You can’t perform that action at this time.
0 commit comments