summaryrefslogtreecommitdiffstats
path: root/build/appveyor
diff options
context:
space:
mode:
authorJosepMaJAZ <josepma@gmail.com>2020-04-13 00:37:12 +0200
committerJosepMaJAZ <josepma@gmail.com>2020-04-13 00:37:12 +0200
commit63a98fb4ec2dd870b14cf28cd35dae1478fffff3 (patch)
tree67cc8ec584500a7d1268346bb96a11697a424bc0 /build/appveyor
parent35a6a1316fbf2fd9e577f3e75166307974047500 (diff)
This fixes some bugs building in debug:
- do not use link time code generation since that slows down the build. - fixes if built with dynamically linked libraries. Note: Currently it needs manual copying of such dlls into the compiled directory (including the qt plugins). - Fixed detection of opus. I don't know why it didn't work as it was. Version included in CMake tools for visual studio is 3.16.19112601-MSVC_2 - Fixed a database driver initialization error. This should only happen if SQLITE_OMIT_AUTOINIT was set. I didn't saw where this could happen, so I simply call sqlite3_initialize() explicitly in dbconnection. It is a no-op operation if it is already initialized.
Diffstat (limited to 'build/appveyor')
-rw-r--r--build/appveyor/build_mixxx.bat10
1 files changed, 7 insertions, 3 deletions
diff --git a/build/appveyor/build_mixxx.bat b/build/appveyor/build_mixxx.bat
index a520c471bc..5ec2bc5fe2 100644
--- a/build/appveyor/build_mixxx.bat
+++ b/build/appveyor/build_mixxx.bat
@@ -94,9 +94,13 @@ set WINLIB_DIR=%3
SET BIN_DIR=%WINLIB_DIR%\bin
SET LIB_DIR=%WINLIB_DIR%\lib
SET INCLUDE_DIR=%WINLIB_DIR%\include
-REM TODO(rryan): Remove hard-coding of Qt version.
-set QT_VERSION=5.12.0
-SET QTDIR=%WINLIB_DIR%\Qt-%QT_VERSION%
+FOR /D %%G IN (%WINLIB_DIR%\Qt-*) DO SET QTDIR=%%G
+IF "!QTDIR!" EQU "" (
+echo QT not found on %WINLIB_DIR%
+exit /b 1
+)
+
+
if NOT EXIST "%BIN_DIR%\scons.py" (
echo.