3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-15 01:01:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix compile errors

Browse source
This commit is contained in:
badaix 2018-02-03 21:55:54 +01:00
parent 5da4fe8830
commit 39b880e650
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/Makefile
View file

@ -60,13 +60,13 @@ else ifeq ($(TARGET), OPENWRT)
STRIP = echo STRIP = echo
CXXFLAGS += -pthread -DNO_CPP11_STRING -DHAS_OGG -DHAS_TREMOR -DHAS_FLAC -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON CXXFLAGS += -pthread -DNO_CPP11_STRING -DHAS_OGG -DHAS_TREMOR -DHAS_FLAC -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
LDFLAGS = -lasound -lvorbisidec -logg -lFLAC -lavahi-client -lavahi-common -latomic LDFLAGS = -lasound -lvorbisidec -logg -lFLAC -lavahi-client -lavahi-common -latomic
OBJ += player/alsaPlayer.o browseZeroConf/browseAvahi.o OBJ += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
else ifeq ($(TARGET), BUILDROOT) else ifeq ($(TARGET), BUILDROOT)
CXXFLAGS += -pthread -DNO_CPP11_STRING -DHAS_OGG -DHAS_TREMOR -DHAS_FLAC -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON CXXFLAGS += -pthread -DNO_CPP11_STRING -DHAS_OGG -DHAS_TREMOR -DHAS_FLAC -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
LDFLAGS += -lasound -lvorbisidec -logg -lFLAC -lavahi-client -lavahi-common -latomic LDFLAGS += -lasound -lvorbisidec -logg -lFLAC -lavahi-client -lavahi-common -latomic
OBJ += player/alsaPlayer.o browseZeroConf/browseAvahi.o OBJ += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
else ifeq ($(TARGET), MACOS) else ifeq ($(TARGET), MACOS)
@ -75,7 +75,7 @@ STRIP = strip
CXXFLAGS += -DHAS_OGG -DHAS_VORBIS -DHAS_COREAUDIO -DFREEBSD -DMACOS -DHAS_BONJOUR -DHAS_DAEMON -I/usr/local/include -Wno-unused-local-typedef -Wno-deprecated CXXFLAGS += -DHAS_OGG -DHAS_VORBIS -DHAS_COREAUDIO -DFREEBSD -DMACOS -DHAS_BONJOUR -DHAS_DAEMON -I/usr/local/include -Wno-unused-local-typedef -Wno-deprecated
CXXFLAGS += -DHAS_OGG -DHAS_VORBIS -DHAS_FLAC -DHAS_COREAUDIO -DFREEBSD -DMACOS -DHAS_BONJOUR -DHAS_DAEMON -I/usr/local/include -Wno-unused-local-typedef -Wno-deprecated CXXFLAGS += -DHAS_OGG -DHAS_VORBIS -DHAS_FLAC -DHAS_COREAUDIO -DFREEBSD -DMACOS -DHAS_BONJOUR -DHAS_DAEMON -I/usr/local/include -Wno-unused-local-typedef -Wno-deprecated
LDFLAGS = -logg -lvorbis -lFLAC -L/usr/local/lib -framework AudioToolbox -framework CoreFoundation LDFLAGS = -logg -lvorbis -lFLAC -L/usr/local/lib -framework AudioToolbox -framework CoreFoundation
OBJ += player/coreAudioPlayer.o browseZeroConf/browseBonjour.o OBJ += ../common/daemon.o player/coreAudioPlayer.o browseZeroConf/browseBonjour.o
else else
@ -83,7 +83,7 @@ CXX = g++
STRIP = strip STRIP = strip
CXXFLAGS += -pthread -DHAS_OGG -DHAS_VORBIS -DHAS_FLAC -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON CXXFLAGS += -pthread -DHAS_OGG -DHAS_VORBIS -DHAS_FLAC -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
LDFLAGS = -lrt -lasound -logg -lvorbis -lFLAC -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ LDFLAGS = -lrt -lasound -logg -lvorbis -lFLAC -lavahi-client -lavahi-common -static-libgcc -static-libstdc++
OBJ += player/alsaPlayer.o browseZeroConf/browseAvahi.o OBJ += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
endif endif

4
client/snapClient.cpp
View file

@ -63,7 +63,7 @@ int main (int argc, char **argv)
auto versionSwitch = op.add<Switch>("v", "version", "show version number"); auto versionSwitch = op.add<Switch>("v", "version", "show version number");
#if defined(HAS_ALSA) #if defined(HAS_ALSA)
auto listSwitch = op.add<Switch>("l", "list", "list pcm devices"); auto listSwitch = op.add<Switch>("l", "list", "list pcm devices");
/*auto soundcardValue =*/ op.add<Value<string>>("s", "soundcard", "index or name of the soundcard", "default", &soundcard); auto soundcardValue = op.add<Value<string>>("s", "soundcard", "index or name of the soundcard", "default", &soundcard);
#endif #endif
auto metaStderr = op.add<Switch>("e", "mstderr", "send metadata to stderr"); auto metaStderr = op.add<Switch>("e", "mstderr", "send metadata to stderr");
//auto metaHook = op.add<Value<string>>("m", "mhook", "script to call on meta tags", "", &meta_script); //auto metaHook = op.add<Value<string>>("m", "mhook", "script to call on meta tags", "", &meta_script);
@ -176,7 +176,7 @@ int main (int argc, char **argv)
PcmDevice pcmDevice; PcmDevice pcmDevice;
pcmDevice.idx = 1; pcmDevice.idx = 1;
if (soundcardValue.isSet()) if (soundcardValue->is_set())
pcmDevice.name = soundcard; pcmDevice.name = soundcard;
if (host.empty()) if (host.empty())

10
server/Makefile
View file

@ -50,13 +50,13 @@ ifeq ($(TARGET), ANDROID)
CXX = $(NDK_DIR)/bin/arm-linux-androideabi-g++ CXX = $(NDK_DIR)/bin/arm-linux-androideabi-g++
STRIP = $(NDK_DIR)/bin/arm-linux-androideabi-strip STRIP = $(NDK_DIR)/bin/arm-linux-androideabi-strip
CXXFLAGS += -pthread -DNO_CPP11_STRING -fPIC -I$(NDK_DIR)/include CXXFLAGS += -pthread -DNO_CPP11_STRING -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -fPIC -I$(NDK_DIR)/include
LDFLAGS += -L$(NDK_DIR)/lib -pie -llog -latomic LDFLAGS += -L$(NDK_DIR)/lib -pie -llog -latomic
else ifeq ($(TARGET), OPENWRT) else ifeq ($(TARGET), OPENWRT)
STRIP = echo STRIP = echo
CXXFLAGS += -DNO_CPP11_STRING -DHAS_AVAHI -DHAS_DAEMON -pthread CXXFLAGS += -DNO_CPP11_STRING -DHAS_AVAHI -DHAS_DAEMON -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -pthread
LDFLAGS += -lavahi-client -lavahi-common -latomic LDFLAGS += -lavahi-client -lavahi-common -latomic
OBJ += ../common/daemon.o publishZeroConf/publishAvahi.o OBJ += ../common/daemon.o publishZeroConf/publishAvahi.o
@ -64,7 +64,7 @@ else ifeq ($(TARGET), FREEBSD)
CXX = g++ CXX = g++
STRIP = echo STRIP = echo
CXXFLAGS += -DNO_CPP11_STRING -DHAS_AVAHI -DHAS_DAEMON -pthread CXXFLAGS += -DNO_CPP11_STRING -DHAS_AVAHI -DHAS_DAEMON -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -pthread
LDFLAGS += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ -latomic LDFLAGS += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ -latomic
OBJ += ../common/daemon.o publishZeroConf/publishAvahi.o OBJ += ../common/daemon.o publishZeroConf/publishAvahi.o
@ -72,7 +72,7 @@ else ifeq ($(TARGET), MACOS)
CXX = g++ CXX = g++
STRIP = strip STRIP = strip
CXXFLAGS += -DFREEBSD -DHAS_BONJOUR -DHAS_DAEMON -Wno-deprecated -I/usr/local/include CXXFLAGS += -DFREEBSD -DHAS_BONJOUR -DHAS_DAEMON -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -Wno-deprecated -I/usr/local/include
LDFLAGS += -L/usr/local/lib -framework CoreFoundation -framework IOKit LDFLAGS += -L/usr/local/lib -framework CoreFoundation -framework IOKit
OBJ += ../common/daemon.o publishZeroConf/publishBonjour.o OBJ += ../common/daemon.o publishZeroConf/publishBonjour.o
@ -80,7 +80,7 @@ else
CXX = g++ CXX = g++
STRIP = strip STRIP = strip
CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -pthread CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -DHAS_FLAC -pthread
LDFLAGS = -lrt -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ LDFLAGS = -lrt -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -static-libgcc -static-libstdc++
OBJ += ../common/daemon.o publishZeroConf/publishAvahi.o OBJ += ../common/daemon.o publishZeroConf/publishAvahi.o

1
server/config.h
View file

@ -28,6 +28,7 @@
#include <jsonrpcpp/json.hpp> #include <jsonrpcpp/json.hpp>
#else #else
#include "externals/json.hpp" #include "externals/json.hpp"
#endif
#include "common/utils/string_utils.h" #include "common/utils/string_utils.h"
#include "common/utils.h" #include "common/utils.h"

1
server/encoder/encoderFactory.cpp
View file

@ -23,6 +23,7 @@
#endif #endif
#if defined(HAS_FLAC) #if defined(HAS_FLAC)
#include "flacEncoder.h" #include "flacEncoder.h"
#endif
#include "common/utils/string_utils.h" #include "common/utils/string_utils.h"
#include "common/snapException.h" #include "common/snapException.h"
#include "aixlog.hpp" #include "aixlog.hpp"