SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move windeployqt to Qmake

Browse Source 
`qmake` is better suited for finding `windeployqt`, since it's in the same
directory as `qmake` on windows.

`qmake` is also better suited for finding the build target
(release/debug) vs third party scripts.

`windeployqt` is being forced to run in `cmd` because the syntax is
different for running executables in powershell, which means
`windeployqt` won't be executed and runtime or package errors will
occur.

With the removal of the windeployqt call the deploy step is no longer
needed for building on Windows, since all previous deploy tasks are now
handle by Qmake.
This commit is contained in:
Vasily
2019-07-30 10:45:28 +02:00
committed by username223
parent 94bbd30890
commit 8e43629bb2
3 changed files with 25 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_windows.cmd
-6
View File
@@ -27,12 +27,6 @@ IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
call %project_dir%\build_scripts\win\current_build.bat
IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
ECHO %top_level_activity%: Calling deployment script.
%PYTHON_LOC%python %project_dir%\build_scripts\win\build.py deploy
IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
call %project_dir%\build_scripts\win\current_build.bat
IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
REM The average dev doesn't need to package and zip it, just build it and test.
IF NOT DEFINED BUILD_PACKAGE (
ECHO %top_level_activity%: BUILD_PACKAGE not set. Not building installer and portable zip versions.