added --enable-rfxcodec

ulab-next-nosound
Jay Sorg 11 years ago
parent 9795ce010a
commit 7d5f7d1133

@ -51,6 +51,10 @@ AC_ARG_ENABLE(xrdpvr, AS_HELP_STRING([--enable-xrdpvr],
[Build xrdpvr module (default: no)]), [Build xrdpvr module (default: no)]),
[xrdpvr=true], [xrdpvr=false]) [xrdpvr=true], [xrdpvr=false])
AM_CONDITIONAL(XRDP_XRDPVR, [test x$xrdpvr = xtrue]) AM_CONDITIONAL(XRDP_XRDPVR, [test x$xrdpvr = xtrue])
AC_ARG_ENABLE(rfxcodec, AS_HELP_STRING([--enable-rfxcodec],
[Build using librfxcodec (default: no)]),
[rfxcodec=true], [rfxcodec=false])
AM_CONDITIONAL(XRDP_RFXCODEC, [test x$rfxcodec = xtrue])
AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"]) AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"])

@ -15,6 +15,12 @@ EXTRA_INCLUDES += -I$(prefix)/include
EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
endif endif
if XRDP_RFXCODEC
EXTRA_DEFINES += -DXRDP_RFXCODEC
EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include
EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.a
endif
AM_CFLAGS = \ AM_CFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -50,7 +56,8 @@ xrdp_SOURCES = \
xrdp_LDADD = \ xrdp_LDADD = \
$(top_builddir)/common/libcommon.la \ $(top_builddir)/common/libcommon.la \
$(top_builddir)/libxrdp/libxrdp.la $(top_builddir)/libxrdp/libxrdp.la \
$(EXTRA_LIBS)
xrdp_LDFLAGS = \ xrdp_LDFLAGS = \
$(EXTRA_FLAGS) $(EXTRA_FLAGS)

@ -23,6 +23,10 @@
#include "thread_calls.h" #include "thread_calls.h"
#include "fifo.h" #include "fifo.h"
#ifdef XRDP_RFXCODEC
#include "rfxcodec_encode.h"
#endif
#define LLOG_LEVEL 1 #define LLOG_LEVEL 1
#define LLOGLN(_level, _args) \ #define LLOGLN(_level, _args) \
do \ do \

Loading…
Cancel
Save