|
a/Makefile.am |
|
b/Makefile.am |
|
... |
|
... |
| 23 |
if WITH_OHBUILD
|
23 |
if WITH_OHBUILD
|
| 24 |
AM_CPPFLAGS += \
|
24 |
AM_CPPFLAGS += \
|
| 25 |
-I$(TOPOH)ohNet/Build/Include/ \
|
25 |
-I$(TOPOH)ohNet/Build/Include/ \
|
| 26 |
-I$(TOPOH)ohNetGenerated/Build/Include/ \
|
26 |
-I$(TOPOH)ohNetGenerated/Build/Include/ \
|
| 27 |
-I$(TOPOH)ohTopology/build/Include/ \
|
27 |
-I$(TOPOH)ohTopology/build/Include/ \
|
|
|
28 |
-I$(TOPSCO) \
|
| 28 |
-I$(TOPSC) \
|
29 |
-I$(TOPSC) \
|
| 29 |
-DWITH_OHBUILD
|
30 |
-DWITH_OHBUILD
|
| 30 |
else
|
31 |
else
|
| 31 |
AM_CPPFLAGS += -I$(TOPOHNET)include/ohNet
|
32 |
AM_CPPFLAGS += -I$(TOPOHNET)include/ohNet
|
| 32 |
endif
|
33 |
endif
|
|
... |
|
... |
| 40 |
|
41 |
|
| 41 |
AM_CXXFLAGS = -std=c++11
|
42 |
AM_CXXFLAGS = -std=c++11
|
| 42 |
|
43 |
|
| 43 |
bin_PROGRAMS = sc2mpd mpd2sc
|
44 |
bin_PROGRAMS = sc2mpd mpd2sc
|
| 44 |
|
45 |
|
| 45 |
OTHEROSC2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
|
|
|
| 46 |
$(TOPSCO)/OhmReceiver.o $(TOPSCO)/OhmProtocolMulticast.o \
|
|
|
| 47 |
$(TOPSCO)/OhmProtocolUnicast.o \
|
|
|
| 48 |
$(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o
|
|
|
| 49 |
|
|
|
| 50 |
if WITH_OHBUILD
|
46 |
if WITH_OHBUILD
|
| 51 |
sc2mpd_LDADD = $(OTHEROSC2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
|
47 |
sc2mpd_LDADD = $(TOPSCO)libohSongcast.a \
|
|
|
48 |
$(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
|
| 52 |
$(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
|
49 |
$(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
|
| 53 |
else
|
50 |
else
|
| 54 |
sc2mpd_LDADD = \
|
51 |
sc2mpd_LDADD = \
|
| 55 |
-L${TOPOHSONGCAST}lib/ohSongcast -lohSongcast \
|
52 |
-L${TOPOHSONGCAST}lib/ohSongcast -lohSongcast \
|
| 56 |
-L${TOPOHNETGENERATED}lib/ohNetGenerated -lohNetGeneratedDevices \
|
53 |
-L${TOPOHNETGENERATED}lib/ohNetGenerated -lohNetGeneratedDevices \
|
|
... |
|
... |
| 60 |
endif
|
57 |
endif
|
| 61 |
sc2mpd_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS)
|
58 |
sc2mpd_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS)
|
| 62 |
|
59 |
|
| 63 |
sc2mpd_SOURCES = \
|
60 |
sc2mpd_SOURCES = \
|
| 64 |
sc2src/alsadirect.cpp \
|
61 |
sc2src/alsadirect.cpp \
|
|
|
62 |
sc2src/audiodecoder.cpp \
|
|
|
63 |
sc2src/audiodecoder.h \
|
| 65 |
sc2src/chrono.cpp \
|
64 |
sc2src/chrono.cpp \
|
| 66 |
sc2src/chrono.h \
|
65 |
sc2src/chrono.h \
|
| 67 |
sc2src/conf_post.h \
|
66 |
sc2src/conf_post.h \
|
| 68 |
sc2src/conftree.cpp \
|
67 |
sc2src/conftree.cpp \
|
| 69 |
sc2src/conftree.h \
|
68 |
sc2src/conftree.h \
|
| 70 |
sc2src/httpgate.cpp \
|
69 |
sc2src/httpgate.cpp \
|
| 71 |
sc2src/log.cpp \
|
70 |
sc2src/log.cpp \
|
| 72 |
sc2src/log.h \
|
71 |
sc2src/log.h \
|
| 73 |
sc2src/pathut.cpp \
|
72 |
sc2src/pathut.cpp \
|
| 74 |
sc2src/pathut.h \
|
73 |
sc2src/pathut.h \
|
|
|
74 |
sc2src/pcmdecoder.cpp \
|
|
|
75 |
sc2src/pcmdecoder.h \
|
| 75 |
sc2src/rcvqueue.h \
|
76 |
sc2src/rcvqueue.h \
|
| 76 |
sc2src/sc2mpd.cpp \
|
77 |
sc2src/sc2mpd.cpp \
|
|
|
78 |
sc2src/songcastreceiver.cpp \
|
|
|
79 |
sc2src/songcastreceiver.h \
|
| 77 |
sc2src/smallut.cpp \
|
80 |
sc2src/smallut.cpp \
|
| 78 |
sc2src/smallut.h \
|
81 |
sc2src/smallut.h \
|
| 79 |
sc2src/watcher.cpp \
|
82 |
sc2src/watcher.cpp \
|
| 80 |
sc2src/watcher.h \
|
83 |
sc2src/watcher.h \
|
| 81 |
sc2src/wav.cpp \
|
84 |
sc2src/wav.cpp \
|
| 82 |
sc2src/wav.h \
|
85 |
sc2src/wav.h \
|
| 83 |
sc2src/workqueue.h
|
86 |
sc2src/workqueue.h
|
|
|
87 |
|
|
|
88 |
if FLAC
|
|
|
89 |
sc2mpd_CPPFLAGS += $(FLAC_CFLAGS)
|
|
|
90 |
sc2mpd_SOURCES += \
|
|
|
91 |
sc2src/flacdecoder.cpp \
|
|
|
92 |
sc2src/flacdecoder.h
|
|
|
93 |
endif
|
| 84 |
|
94 |
|
| 85 |
if WAVSC2
|
95 |
if WAVSC2
|
| 86 |
sc2mpd_SOURCES += \
|
96 |
sc2mpd_SOURCES += \
|
| 87 |
mpd2src/openaudio.cpp \
|
97 |
mpd2src/openaudio.cpp \
|
| 88 |
mpd2src/wavreader.cpp \
|
98 |
mpd2src/wavreader.cpp \
|
| 89 |
mpd2src/fiforeader.cpp \
|
99 |
mpd2src/fiforeader.cpp \
|
| 90 |
mpd2src/stringtotokens.cpp
|
100 |
mpd2src/stringtotokens.cpp
|
| 91 |
endif
|
101 |
endif
|
| 92 |
|
102 |
|
| 93 |
OTHEROMP2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
|
103 |
OTHEROMP2 = $(TOPSCO)libohSongcast.a \
|
| 94 |
$(TOPSCO)/OhmSender.o \
|
|
|
| 95 |
$(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
|
104 |
$(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
|
| 96 |
|
105 |
|
| 97 |
if WITH_OHBUILD
|
106 |
if WITH_OHBUILD
|
| 98 |
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
|
107 |
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
|
| 99 |
$(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
|
108 |
$(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
|
|
... |
|
... |
| 106 |
$(OTHERLIBS)
|
115 |
$(OTHERLIBS)
|
| 107 |
endif
|
116 |
endif
|
| 108 |
|
117 |
|
| 109 |
mpd2sc_CPPFLAGS = -I$(top_srcdir)/sc2src $(AM_CPPFLAGS)
|
118 |
mpd2sc_CPPFLAGS = -I$(top_srcdir)/sc2src $(AM_CPPFLAGS)
|
| 110 |
mpd2sc_SOURCES = \
|
119 |
mpd2sc_SOURCES = \
|
|
|
120 |
mpd2src/audioencoder.cpp \
|
|
|
121 |
mpd2src/audioencoder.h \
|
| 111 |
mpd2src/audioreader.h \
|
122 |
mpd2src/audioreader.h \
|
| 112 |
mpd2src/audioutil.h \
|
123 |
mpd2src/audioutil.h \
|
| 113 |
mpd2src/base64.cxx \
|
124 |
mpd2src/base64.cxx \
|
| 114 |
mpd2src/base64.hxx \
|
125 |
mpd2src/base64.hxx \
|
| 115 |
mpd2src/fiforeader.cpp \
|
126 |
mpd2src/fiforeader.cpp \
|
| 116 |
mpd2src/fiforeader.h \
|
127 |
mpd2src/fiforeader.h \
|
| 117 |
mpd2src/icon.h \
|
128 |
mpd2src/icon.h \
|
| 118 |
mpd2src/mpd2sc.cpp \
|
129 |
mpd2src/mpd2sc.cpp \
|
| 119 |
mpd2src/openaudio.cpp \
|
130 |
mpd2src/openaudio.cpp \
|
| 120 |
mpd2src/openaudio.h \
|
131 |
mpd2src/openaudio.h \
|
|
|
132 |
mpd2src/pcmencoder.cpp \
|
|
|
133 |
mpd2src/pcmencoder.h \
|
|
|
134 |
mpd2src/songcastsender.cpp \
|
|
|
135 |
mpd2src/songcastsender.h \
|
| 121 |
mpd2src/stringtotokens.cpp \
|
136 |
mpd2src/stringtotokens.cpp \
|
| 122 |
mpd2src/stringtotokens.h \
|
137 |
mpd2src/stringtotokens.h \
|
| 123 |
mpd2src/wavreader.cpp \
|
138 |
mpd2src/wavreader.cpp \
|
| 124 |
mpd2src/wavreader.h \
|
139 |
mpd2src/wavreader.h \
|
| 125 |
sc2src/log.cpp
|
140 |
sc2src/log.cpp
|
| 126 |
|
141 |
|
|
|
142 |
if FLAC
|
|
|
143 |
mpd2sc_CPPFLAGS += $(FLAC_CFLAGS)
|
|
|
144 |
mpd2sc_SOURCES += \
|
|
|
145 |
mpd2src/flacencoder.cpp \
|
|
|
146 |
mpd2src/flacencoder.h
|
|
|
147 |
endif
|
|
|
148 |
|
| 127 |
dist_bin_SCRIPTS = mpd2src/scmakempdsender
|
149 |
dist_bin_SCRIPTS = mpd2src/scmakempdsender
|
| 128 |
dist_noinst_SCRIPTS = ohbuild.sh
|
150 |
dist_noinst_SCRIPTS = ohbuild.sh
|
| 129 |
|
151 |
|
| 130 |
dist-hook:
|
152 |
dist-hook:
|
| 131 |
test -z "`git status -s | grep -v sc2mpd-$(VERSION)`"
|
153 |
test -z "`git status -s | grep -v sc2mpd-$(VERSION)`"
|