Switch to unified view

a/Makefile.am b/Makefile.am
...
...
21
            -I$(TOPOH)ohTopology/build/Include/  \
21
            -I$(TOPOH)ohTopology/build/Include/  \
22
            -I$(TOPSC)
22
            -I$(TOPSC)
23
23
24
AM_CXXFLAGS = -std=c++0x
24
AM_CXXFLAGS = -std=c++0x
25
25
26
bin_PROGRAMS = sc2mpd
26
bin_PROGRAMS = sc2mpd mpd2sc
27
27
28
# Maybe these are needed for the oh headers ?
28
# Maybe these are needed for the oh headers ?
29
OHCCFLAGS = -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN \
29
OHCCFLAGS = -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN \
30
          -DDEFINE_TRACE \
30
          -DDEFINE_TRACE \
31
          -DDllImport="__attribute__ ((visibility(\"default\")))" \
31
          -DDllImport="__attribute__ ((visibility(\"default\")))" \
32
          -DDllExport="__attribute__ ((visibility(\"default\")))" \
32
          -DDllExport="__attribute__ ((visibility(\"default\")))" \
33
          -DDllExportClass="__attribute__ ((visibility(\"default\")))"
33
          -DDllExportClass="__attribute__ ((visibility(\"default\")))"
34
34
35
OTHEROBJECTS = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
35
OTHEROSC2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
36
             $(TOPSCO)/OhmReceiver.o $(TOPSCO)/OhmProtocolMulticast.o \
36
             $(TOPSCO)/OhmReceiver.o $(TOPSCO)/OhmProtocolMulticast.o \
37
             $(TOPSCO)/OhmProtocolUnicast.o \
37
             $(TOPSCO)/OhmProtocolUnicast.o \
38
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o
38
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgReceiver1.o
39
39
40
sc2mpd_LDADD = $(OTHEROBJECTS) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
40
sc2mpd_LDADD = $(OTHEROSC2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
41
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
41
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
42
42
43
sc2mpd_SOURCES = \
43
sc2mpd_SOURCES = \
44
     ohbuild.sh \
44
     ohbuild.sh \
45
     src/alsadirect.cpp \
45
     sc2src/alsadirect.cpp \
46
     src/chrono.cpp \
46
     sc2src/chrono.cpp \
47
     src/chrono.h \
47
     sc2src/chrono.h \
48
     src/conftree.cpp \
48
     sc2src/conftree.cpp \
49
     src/conftree.h \
49
     sc2src/conftree.h \
50
     src/httpgate.cpp \
50
     sc2src/httpgate.cpp \
51
     src/log.cpp \
51
     sc2src/log.cpp \
52
     src/log.h \
52
     sc2src/log.h \
53
     src/ptmutex.h \
53
     sc2src/ptmutex.h \
54
     src/rcvqueue.h \
54
     sc2src/rcvqueue.h \
55
     src/sc2mpd.cpp \
55
     sc2src/sc2mpd.cpp \
56
     src/wav.cpp \
56
     sc2src/wav.cpp \
57
     src/wav.h \
57
     sc2src/wav.h \
58
     src/workqueue.h
58
     sc2src/workqueue.h
59
     
59
     
60
#dist-hook:
60
OTHEROMP2 = $(TOPSCO)/Ohm.o $(TOPSCO)/OhmMsg.o $(TOPSCO)/OhmSocket.o \
61
# test -z "`git status -s | grep -v sc2mpd-$(VERSION)`"
61
             $(TOPSCO)/OhmSender.o \
62
# git tag -f -a sc2mpd-v$(VERSION) -m 'version $(VERSION)'
62
             $(TOPOH)ohNetGenerated/$(OBJIPATH)DvAvOpenhomeOrgSender1.o
63
64
mpd2sc_CPPFLAGS = -I$(srcdir)/sc2src $(AM_CPPFLAGS) 
65
mpd2sc_LDADD = $(OTHEROMP2) $(TOPOH)ohNet/$(OBJIPATH)libohNetCore.a \
66
     $(TOPOH)ohNet/$(OBJIPATH)libTestFramework.a $(OTHERLIBS)
67
68
mpd2sc_SOURCES = \
69
     mpd2src/base64.cxx \
70
     mpd2src/fiforeader.cpp \
71
     mpd2src/openaudio.cpp \
72
     mpd2src/stringtotokens.cpp \
73
     mpd2src/mpd2sc.cpp \
74
     mpd2src/wavreader.cpp \
75
     sc2src/log.cpp
76