浏览代码

[Development] Link libvnc.so against libdix, libXi and libxkb.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3928 3789f03b-4d11-0410-bbf8-ca57d06f2519
tags/v1.0.90
Adam Tkac 14 年前
父节点
当前提交
9e926ebe56
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1
    1
      unix/xserver/hw/vnc/Makefile.am
  2. 2
    1
      unix/xserver17.patch

+ 1
- 1
unix/xserver/hw/vnc/Makefile.am 查看文件

@@ -52,7 +52,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) -UHAVE_CONFIG_H \

libvnc_la_LDFLAGS = -module -avoid-version

libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(LIBVNC_LIBS)

EXTRA_DIST = Xvnc.man


+ 2
- 1
unix/xserver17.patch 查看文件

@@ -16,13 +16,14 @@
AM_PROG_AS
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -1383,6 +1383,9 @@ if test "x$XVFB" = xyes; then
@@ -1383,6 +1383,10 @@ if test "x$XVFB" = xyes; then
AC_SUBST([XVFB_SYS_LIBS])
fi
+dnl Xvnc DDX
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
+AC_SUBST([LIBVNC_LIBS], ["$XI_LIB $DIX_LIB $XKB_LIB"])
dnl Xnest DDX

正在加载...
取消
保存