mirror of
https://github.com/clangen/musikcube.git
synced 2025-01-01 00:19:20 +00:00
Removed some unnecessary dependencies from CMakeLists and fixed compile on older versions of clang.
This commit is contained in:
parent
83fc208daf
commit
f57abafb42
@ -4,7 +4,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.0)
|
||||||
|
|
||||||
project(musikbox)
|
project(musikbox)
|
||||||
|
|
||||||
set (musikbox_VERSION_MAJOR 0)
|
set (musikbox_VERSION_MAJOR 0)
|
||||||
set (musikbox_VERSION_MINOR 1)
|
set (musikbox_VERSION_MINOR 1)
|
||||||
|
|
||||||
@ -25,12 +24,8 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
|
|||||||
|
|
||||||
set (BOOST_LIBS
|
set (BOOST_LIBS
|
||||||
system
|
system
|
||||||
date_time
|
|
||||||
chrono
|
|
||||||
filesystem
|
filesystem
|
||||||
iostreams
|
|
||||||
thread
|
thread
|
||||||
regex
|
|
||||||
)
|
)
|
||||||
|
|
||||||
find_package(Boost 1.55.0 REQUIRED ${BOOST_LIBS})
|
find_package(Boost 1.55.0 REQUIRED ${BOOST_LIBS})
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "M4aDecoder.h"
|
#include "M4aDecoder.h"
|
||||||
#include <stdlib.h>
|
#include <cstring>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
using musik::core::sdk::IDataStream;
|
using musik::core::sdk::IDataStream;
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include "NomadDecoder.h"
|
#include "NomadDecoder.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
using namespace musik::core::sdk;
|
using namespace musik::core::sdk;
|
||||||
|
|
||||||
@ -169,4 +170,4 @@ size_t NomadDecoder::GetId3v2HeaderLength(musik::core::sdk::IDataStream *stream)
|
|||||||
((parts[2] & 0x7F) << 7) |
|
((parts[2] & 0x7F) << 7) |
|
||||||
((parts[1] & 0x7F) << 14) |
|
((parts[1] & 0x7F) << 14) |
|
||||||
((parts[0] & 0x7F) << 21);
|
((parts[0] & 0x7F) << 21);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user