File tree Expand file tree Collapse file tree 5 files changed +14
-10
lines changed
Expand file tree Collapse file tree 5 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 44::
55:: Edit this line to run the batch file for Qt environment.
66::
7- :: call "C:\Qt\Qt5.6.2-mingw\5.6\mingw49_32\bin\qtenv2.bat"
8- call " C:\Qt\Qt5.9.1\5.9.1\mingw53_32\bin\qtenv2.bat"
9- :: call "C:\Qt\Qt5.9.1\5.9.1\msvc2015_64\bin\qtenv2.bat"
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"
1013
11- :: call "C:\Program Files (x86)\Microsoft Visual Studio 12 .0\VC\vcvarsall.bat" amd64
12- :: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC \vcvarsall.bat" amd64
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
1316
1417cd /D %~dp0
1518call compile_install.bat
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ cd /D %~dp0
55
66:: Requires Qt environment.
77
8- if " %Platform% " == " X64 " (
8+ if not " %Platform% " == " " (
99 set MAKE = nmake
1010 set CL = /MP
1111) else if not " %DevEnvDir% " == " " (
Original file line number Diff line number Diff line change @@ -72,6 +72,9 @@ if not "%MSCOMPILER%" == "" (
7272 if " %Platform% " == " X64" (
7373 set VCVARSOPT = amd64
7474 set ENVSTR = Environment to build for 64-bit executable MSVC / Qt
75+ ) else if " %Platform% " == " x64" (
76+ set VCVARSOPT = amd64
77+ set ENVSTR = Environment to build for 64-bit executable MSVC / Qt
7578 ) else (
7679 set VCVARSOPT = x86
7780 set ENVSTR = Environment to build for 32-bit executable MSVC / Qt
Original file line number Diff line number Diff line change 1010#include < windows.h>
1111#include < tlhelp32.h>
1212#include < psapi.h>
13- #include < winternl.h>
14- #include < ntstatus.h>
1513#include " tprocessinfo.h"
1614
1715
Original file line number Diff line number Diff line change 55 * the New BSD License, which is incorporated herein by reference.
66 */
77
8- #include < windows.h>
9- #include < vector>
108#include < QtCore>
119#include < TGlobal>
1210#include < TWebApplication>
1311#include < TSystemGlobal>
12+ #include < vector>
13+ #include < windows.h>
1414namespace TreeFrog {
1515
1616extern int managerMain (int argc, char *argv[]);
You can’t perform that action at this time.
0 commit comments