Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2025-10-26 07:46:09 +01:00
Code Issues Packages Projects Releases Activity

Update Windows build

Browse Source
This commit is contained in:
Ximi1970
2021-09-22 21:02:14 +02:00
parent bb3a1e1553
commit e01001a2be
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -69,10 +69,10 @@ systray-x-app:
mkdir -p app/build32 ;\
mkdir -p app/dist/win32 ;\
cd app/build32 ;\
../build.bat x86 5.14.2 ;\
../build.bat x86 5.15.2 ;\
cd ../.. ;\
mkdir -p app/build64 ;\
cd app/build64 ;\
../build.bat x86_64 5.14.2 ;\
../build.bat x86_64 5.15.2 ;\
cd ../..
endif

27
app/build.bat
View File

@@ -13,12 +13,10 @@ set WIN=
if /I "%1"=="x86" (
set ARCH=x86
set WIN=win32
set SPEC=msvc2017
)
if /I "%1"=="x86_64" (
set ARCH=x86_amd64
set WIN=win64
set SPEC=msvc2017_64
)
if "%ARCH%" == "" (
goto :usage
@@ -27,6 +25,21 @@ if "%ARCH%" == "" (
set QT_VER=
if /I "%2"=="5.14.2" (
set QT_VER=5.14.2
if "%ARCH%"=="x86" (
set SPEC=msvc2017
)
if "%ARCH%"=="x86_amd64" (
set SPEC=msvc2017_64
)
)
if /I "%2"=="5.15.2" (
set QT_VER=5.15.2
if "%ARCH%"=="x86" (
set SPEC=msvc2019
)
if "%ARCH%"=="x86_amd64" (
set SPEC=msvc2019_64
)
)
if "%QT_VER%" == "" (
goto :usage
@@ -34,9 +47,15 @@ if "%QT_VER%" == "" (
@REM Setup Visual Studio Express 2017
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\WDExpress\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
if "%QT_VER%"=="5.14.2" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\WDExpress\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
)
@REM Run qmake for VS2017
if "%QT_VER%"=="5.15.2" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
)
@REM Run qmake
C:\Qt\%QT_VER%\%SPEC%\bin\qmake ..\SysTray-X\SysTray-X.pro -spec win32-msvc
nmake