Merge pull request #4330 from lukas-w/circleci-update

Update CircleCI to Ubuntu 18.04
This commit is contained in:
Lukas W
2018-04-28 22:26:19 +02:00
committed by GitHub
27 changed files with 219 additions and 180 deletions

View File

@@ -34,7 +34,7 @@ IF(WIN32 AND MSVC)
ELSEIF(WIN32)
SET(WINRC "${CMAKE_BINARY_DIR}/lmmsrc.obj")
ADD_CUSTOM_COMMAND(OUTPUT "${WINRC}"
COMMAND "${WINDRES}"
COMMAND "${CMAKE_RC_COMPILER}"
"-I\"${CMAKE_SOURCE_DIR}\""
"-o\"${CMAKE_BINARY_DIR}/lmmsrc.obj\""
"-i\"${CMAKE_BINARY_DIR}/lmms.rc\""

View File

@@ -24,9 +24,11 @@
#include "MixerWorkerThread.h"
#include "denormals.h"
#include <xmmintrin.h>
#include <QMutex>
#include <QWaitCondition>
#include "denormals.h"
#include "ThreadableJob.h"
#include "Mixer.h"