diff options
| author | JosepMaJAZ <josepma@gmail.com> | 2020-01-14 20:51:43 +0100 |
|---|---|---|
| committer | JosepMaJAZ <josepma@gmail.com> | 2020-01-14 20:51:43 +0100 |
| commit | 7fc7ab55c58d4a96921860ba95a57b717bc63950 (patch) | |
| tree | 0b290010443ff02aeddd8f4221d6459ff17eeaf8 /build/appveyor | |
| parent | 2c9528ddedbe944023ab733178af8b11238f1480 (diff) | |
Fixes from PR
Diffstat (limited to 'build/appveyor')
| -rw-r--r-- | build/appveyor/build_mixxx.bat | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build/appveyor/build_mixxx.bat b/build/appveyor/build_mixxx.bat index 8fcd0e1e61..a520c471bc 100644 --- a/build/appveyor/build_mixxx.bat +++ b/build/appveyor/build_mixxx.bat @@ -120,8 +120,6 @@ call "%BUILDTOOLS_PATH%\%BUILDTOOLS_SCRIPT%" %COMPILER_X64% -vcvars_ver=%PARAM_V set MACHINE_TYPE=x86_64 ) -REM Now build Mixxx. - if %CONFIG_RELEASE% ( set BUILD_TYPE=release ) else ( @@ -134,6 +132,7 @@ rem /EHsc Do not handle SEH in try / except blocks. set CXXFLAGS=/MP /FS /EHsc set CFLAGS=/MP /FS /EHsc +REM Now build Mixxx. set PATH=%BIN_DIR%;%PATH% scons.py %SCONS_NUMBER_PROCESSORS% mixxx %PARAM_INSTALLER% toolchain=msvs winlib=%WINLIB_DIR% build=%BUILD_TYPE% staticlibs=1 staticqt=1 debug_assertions_fatal=1 verbose=0 machine=%MACHINE_TYPE% qtdir=%QTDIR% hss1394=1 mediafoundation=1 opus=1 localecompare=1 optimize=%PARAM_OPTIMIZE% virtualize=0 test=%PARAM_TEST% qt_sqlite_plugin=0 build_number_in_title_bar=0 bundle_pdbs=0 @@ -175,7 +174,6 @@ FOR %%Y IN (2019,2017) DO ( REM FOR EXIT /B 1 - :function_has_64bit FOR /F %%G IN ('dir "%BUILDTOOLS_PATH%\Tools\MSVC\%PARAM_VCVARSVER%*" /b /ad-h /o-n') DO ( set "LOCAL_64_CL=%BUILDTOOLS_PATH%\Tools\MSVC\%%G\bin\Hostx64\x64\cl.exe" @@ -183,4 +181,4 @@ FOR /F %%G IN ('dir "%BUILDTOOLS_PATH%\Tools\MSVC\%PARAM_VCVARSVER%*" /b /ad-h / EXIT /B 0 ) ) -EXIT /B 1
\ No newline at end of file +EXIT /B 1 |