From f57abafb422a58a3e11636876eec49bf3f00792c Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 1 Jan 2017 13:59:22 -0800 Subject: [PATCH] Removed some unnecessary dependencies from CMakeLists and fixed compile on older versions of clang. --- CMakeLists.txt | 5 ----- src/contrib/m4adecoder/M4aDecoder.cpp | 2 +- src/contrib/nomaddecoder/NomadDecoder.cpp | 3 ++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1abd95f82..77c4ab4e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.0) project(musikbox) - set (musikbox_VERSION_MAJOR 0) set (musikbox_VERSION_MINOR 1) @@ -25,12 +24,8 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") set (BOOST_LIBS system - date_time - chrono filesystem - iostreams thread - regex ) find_package(Boost 1.55.0 REQUIRED ${BOOST_LIBS}) diff --git a/src/contrib/m4adecoder/M4aDecoder.cpp b/src/contrib/m4adecoder/M4aDecoder.cpp index 5fc23e0d9..78551a986 100644 --- a/src/contrib/m4adecoder/M4aDecoder.cpp +++ b/src/contrib/m4adecoder/M4aDecoder.cpp @@ -34,7 +34,7 @@ #include "stdafx.h" #include "M4aDecoder.h" -#include +#include #include using musik::core::sdk::IDataStream; diff --git a/src/contrib/nomaddecoder/NomadDecoder.cpp b/src/contrib/nomaddecoder/NomadDecoder.cpp index 395d44a8f..352d5f1c3 100644 --- a/src/contrib/nomaddecoder/NomadDecoder.cpp +++ b/src/contrib/nomaddecoder/NomadDecoder.cpp @@ -35,6 +35,7 @@ #include "NomadDecoder.h" #include #include +#include using namespace musik::core::sdk; @@ -169,4 +170,4 @@ size_t NomadDecoder::GetId3v2HeaderLength(musik::core::sdk::IDataStream *stream) ((parts[2] & 0x7F) << 7) | ((parts[1] & 0x7F) << 14) | ((parts[0] & 0x7F) << 21); -} \ No newline at end of file +}