move message dir into common

This commit is contained in:
badaix 2018-03-16 00:19:52 +01:00
parent 3f16a6ce88
commit 54a8ca824f
23 changed files with 14 additions and 12 deletions

View file

@ -11,6 +11,7 @@ set(CLIENT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} common message)
set(CLIENT_INCLUDE
${CMAKE_SOURCE_DIR}/client
${CMAKE_SOURCE_DIR}/common
${ASIO_INCLUDE_DIRS}
${POPL_INCLUDE_DIRS})

View file

@ -34,9 +34,9 @@ endif
DEBUG=-O3
CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -isystem ../externals/asio/asio/include -I../externals/popl/include -I../externals/aixlog/include -I../externals
CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -isystem ../externals/asio/asio/include -I../externals/popl/include -I../externals/aixlog/include -I../externals -I../common
LDFLAGS = -logg -lFLAC
OBJ = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o decoder/pcmDecoder.o decoder/oggDecoder.o decoder/flacDecoder.o controller.o ../message/pcmChunk.o ../common/sampleFormat.o
OBJ = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o decoder/pcmDecoder.o decoder/oggDecoder.o decoder/flacDecoder.o controller.o ../common/message/pcmChunk.o ../common/sampleFormat.o
ifneq (,$(TARGET))

View file

@ -21,7 +21,7 @@
#include <cmath>
#include "flacDecoder.h"
#include "common/snapException.h"
#include "common/endian.h"
#include "common/endian.hpp"
#include "aixlog.hpp"

View file

@ -22,7 +22,7 @@
#include "oggDecoder.h"
#include "common/snapException.h"
#include "common/endian.h"
#include "common/endian.hpp"
#include "aixlog.hpp"

View file

@ -17,7 +17,7 @@
***/
#include "common/snapException.h"
#include "common/endian.h"
#include "common/endian.hpp"
#include "aixlog.hpp"
#include "pcmDecoder.h"

View file

@ -25,7 +25,7 @@
#include <vector>
#include "stream.h"
#include "pcmDevice.h"
#include "common/endian.h"
#include "common/endian.hpp"
#include "aixlog.hpp"