From 1531fb9e1a75dc6eb683570488d70a25ef3cbebe Mon Sep 17 00:00:00 2001 From: Lukas W Date: Wed, 22 Nov 2017 17:57:42 +0100 Subject: [PATCH] MSVC: Fix include, fix GNU compiler flag --- plugins/OpulenZ/CMakeLists.txt | 2 ++ src/core/LocklessAllocator.cpp | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/OpulenZ/CMakeLists.txt b/plugins/OpulenZ/CMakeLists.txt index a80227ce2..58f661406 100644 --- a/plugins/OpulenZ/CMakeLists.txt +++ b/plugins/OpulenZ/CMakeLists.txt @@ -1,7 +1,9 @@ INCLUDE(BuildPlugin) # Avoid unused warnings for mididata.h +IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable") +ENDIF() INCLUDE_DIRECTORIES(adplug/src) diff --git a/src/core/LocklessAllocator.cpp b/src/core/LocklessAllocator.cpp index 3e8d3a7fd..3133a1f08 100644 --- a/src/core/LocklessAllocator.cpp +++ b/src/core/LocklessAllocator.cpp @@ -26,13 +26,12 @@ #include +#include "lmmsconfig.h" + #ifndef LMMS_BUILD_WIN32 #include #endif -#include "lmmsconfig.h" - - static const size_t SIZEOF_SET = sizeof( int ) * 8;