diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2010-11-19 20:34:20 -0800 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2010-11-19 20:34:20 -0800 |
| commit | 4d4f80bfc43e9c901a5609bd8bd78822b7c607bd (patch) | |
| tree | 8333f6f0b081df07dab52728a46d88ab3dcb7663 | |
| parent | 565d86d2823b982a95a7023dc70edf76523803fe (diff) | |
| download | xrdp-proprietary-4d4f80bfc43e9c901a5609bd8bd78822b7c607bd.tar.gz xrdp-proprietary-4d4f80bfc43e9c901a5609bd8bd78822b7c607bd.zip | |
work on freerdp
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | freerdp/Makefile.am | 18 | ||||
| -rw-r--r-- | freerdp/xrdp-freerdp.h | 5 | ||||
| -rw-r--r-- | mc/mc.h | 2 | ||||
| -rw-r--r-- | xrdp/xrdp.ini | 6 |
6 files changed, 31 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index ca3d9a5e..9605bad6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ SUBDIRS = \ rdp \ xup \ mc \ + freerdp \ libxrdp \ xrdp \ sesman \ diff --git a/configure.ac b/configure.ac index fe900269..5861cc74 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,7 @@ AC_CONFIG_FILES([Makefile libxrdp/Makefile xup/Makefile mc/Makefile + freerdp/Makefile xrdp/Makefile sesman/Makefile sesman/libscp/Makefile diff --git a/freerdp/Makefile.am b/freerdp/Makefile.am new file mode 100644 index 00000000..6b560abf --- /dev/null +++ b/freerdp/Makefile.am @@ -0,0 +1,18 @@ + +AM_CFLAGS = \ + -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ + -DXRDP_SBIN_PATH=\"${sbindir}\" \ + -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ + -DXRDP_PID_PATH=\"${localstatedir}/run\" + +INCLUDES = \ + -I$(top_srcdir)/common \ + -I$(top_srcdir)/../freerdp/include/freerdp + +lib_LTLIBRARIES = \ + libxrdpfreerdp.la + +libxrdpfreerdp_la_SOURCES = xrdp-freerdp.c + +libxrdpfreerdp_la_LIBADD = \ + $(top_srcdir)/common/libcommon.la diff --git a/freerdp/xrdp-freerdp.h b/freerdp/xrdp-freerdp.h index 4baf7937..fdababda 100644 --- a/freerdp/xrdp-freerdp.h +++ b/freerdp/xrdp-freerdp.h @@ -26,6 +26,9 @@ #include "os_calls.h" #include "defines.h" +/* this is the freerdp main header */ +#include "freerdp.h" + #define CURRENT_MOD_VER 2 struct mod @@ -82,7 +85,7 @@ struct mod int (*server_send_to_channel)(struct mod* v, int channel_id, char* data, int data_len, int total_data_len, int flags); - int (*server_bell_trigger)(struct vnc* v); + int (*server_bell_trigger)(struct mod* v); long server_dumby[100 - 25]; /* align, 100 minus the number of server functions above */ /* common */ @@ -82,7 +82,7 @@ struct mod int (*server_send_to_channel)(struct mod* v, int channel_id, char* data, int data_len, int total_data_len, int flags); - int (*server_bell_trigger)(struct vnc* v); + int (*server_bell_trigger)(struct mod* v); long server_dumby[100 - 25]; /* align, 100 minus the number of server functions above */ /* common */ diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini index 5b635dda..1e4dbe59 100644 --- a/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini @@ -45,6 +45,12 @@ ip=ask port=ask3389 [xrdp6] +name=freerdp-any +lib=libxrdpfreerdp.so +ip=ask +port=ask3389 + +[xrdp7] name=sesman-X11rdp lib=libxup.so username=ask |