3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-21 02:17:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added target FREEBSD

Browse source
This commit is contained in:
badaix 2016-06-26 11:32:20 +02:00
parent 931df97399
commit d77c4d2880
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/utils.h
View file

@ -38,7 +38,9 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <iomanip> #include <iomanip>
#ifndef FREEBSD
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#endif
#include <sys/utsname.h> #include <sys/utsname.h>
@ -232,9 +234,13 @@ static std::string getArch()
static long uptime() static long uptime()
{ {
#ifndef FREEBSD
struct sysinfo info; struct sysinfo info;
sysinfo(&info); sysinfo(&info);
return info.uptime; return info.uptime;
#else
return 0;
#endif
} }
@ -263,7 +269,11 @@ static std::string getMacAddress(int sock)
{ {
if (!(ifr.ifr_flags & IFF_LOOPBACK)) // don't count loopback if (!(ifr.ifr_flags & IFF_LOOPBACK)) // don't count loopback
{ {
#ifndef FREEBSD
if (ioctl(sock, SIOCGIFHWADDR, &ifr) == 0) if (ioctl(sock, SIOCGIFHWADDR, &ifr) == 0)
#else
if (ioctl(sock, SIOCGIFMAC, &ifr) == 0)
#endif
{ {
success = 1; success = 1;
break; break;
@ -290,9 +300,19 @@ static std::string getMacAddress(int sock)
return ""; return "";
char mac[19]; char mac[19];
#ifndef FREEBSD
sprintf(mac, "%02x:%02x:%02x:%02x:%02x:%02x", sprintf(mac, "%02x:%02x:%02x:%02x:%02x:%02x",
(unsigned char)ifr.ifr_hwaddr.sa_data[0], (unsigned char)ifr.ifr_hwaddr.sa_data[1], (unsigned char)ifr.ifr_hwaddr.sa_data[2], (unsigned char)ifr.ifr_hwaddr.sa_data[0], (unsigned char)ifr.ifr_hwaddr.sa_data[1], (unsigned char)ifr.ifr_hwaddr.sa_data[2],
(unsigned char)ifr.ifr_hwaddr.sa_data[3], (unsigned char)ifr.ifr_hwaddr.sa_data[4], (unsigned char)ifr.ifr_hwaddr.sa_data[5]); (unsigned char)ifr.ifr_hwaddr.sa_data[3], (unsigned char)ifr.ifr_hwaddr.sa_data[4], (unsigned char)ifr.ifr_hwaddr.sa_data[5]);
#else
sprintf(mac, "%02x:%02x:%02x:%02x:%02x:%02x",
(unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[0], (unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[1],
(unsigned
char)ifr.ifr_ifru.ifru_addr.sa_data[2],
(unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[3], (unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[4],
(unsigned
char)ifr.ifr_ifru.ifru_addr.sa_data[5]);
#endif
return mac; return mac;
} }

10
server/Makefile
View file

@ -17,6 +17,14 @@ STRIP = echo
CXXFLAGS += -DIS_BIG_ENDIAN -DNO_CPP11_STRING CXXFLAGS += -DIS_BIG_ENDIAN -DNO_CPP11_STRING
LDFLAGS = -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -latomic LDFLAGS = -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -latomic
else ifeq ($(TARGET), FREEBSD)
SHELL = /usr/local/bin/bash
CXX = /usr/local/bin/g++
CXXFLAGS += -DNO_CPP11_STRING
STRIP = strip
LDFLAGS = -lrt -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -static-libgcc -static-libstdc++
else else
CXX = /usr/bin/g++ CXX = /usr/bin/g++
@ -113,4 +121,4 @@ uninstallsystemd:
rm -f /usr/sbin/$(BIN); \ rm -f /usr/sbin/$(BIN); \
rm -f /lib/systemd/system/$(BIN).service; \ rm -f /lib/systemd/system/$(BIN).service; \
rm -f /etc/default/$(BIN); \ rm -f /etc/default/$(BIN); \
systemctl daemon-reload; \ systemctl daemon-reload; \