diff options
Diffstat (limited to 'orkaudio/filters/rtpmixer')
| -rw-r--r-- | orkaudio/filters/rtpmixer/Makefile.am | 11 | ||||
| -rw-r--r-- | orkaudio/filters/rtpmixer/RtpMixer.cpp | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/orkaudio/filters/rtpmixer/Makefile.am b/orkaudio/filters/rtpmixer/Makefile.am index a5dffcc..e797c9b 100644 --- a/orkaudio/filters/rtpmixer/Makefile.am +++ b/orkaudio/filters/rtpmixer/Makefile.am @@ -1,10 +1,9 @@ METASOURCES = AUTO -plugindir= $(prefix)/lib/orkaudio/plugins +plugindir = @ORKAUDIO_PLUGINS_DIR@ plugin_LTLIBRARIES = librtpmixer.la librtpmixer_la_SOURCES = RtpMixer.cpp -librtpmixer_la_LDFLAGS = -module +librtpmixer_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -D_REENTRANT -librtpmixer_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase -INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common -all-local: librtpmixer.la - cp .libs/librtpmixer.so.0.0.0 ../../plugins/librtpmixer.so +librtpmixer_la_LIBADD = $(ORKBASE_LIBS) -lxerces-c -llog4cxx + +INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS) -I../common diff --git a/orkaudio/filters/rtpmixer/RtpMixer.cpp b/orkaudio/filters/rtpmixer/RtpMixer.cpp index f3e4216..7601f8f 100644 --- a/orkaudio/filters/rtpmixer/RtpMixer.cpp +++ b/orkaudio/filters/rtpmixer/RtpMixer.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h |