diff options
| author | Constantin Kaplinsky <const@tightvnc.com> | 2006-05-25 05:36:48 +0000 |
|---|---|---|
| committer | Constantin Kaplinsky <const@tightvnc.com> | 2006-05-25 05:36:48 +0000 |
| commit | d1e4e901e29d8ef27a6583648c7148b1a5b2facf (patch) | |
| tree | fb34ead4006e43ac22aa6368c6a622320f234261 /xc.patch | |
| parent | 729598cb00d791bbdfe23ebe0023d3a1c3962f83 (diff) | |
| download | tigervnc-d1e4e901e29d8ef27a6583648c7148b1a5b2facf.tar.gz tigervnc-d1e4e901e29d8ef27a6583648c7148b1a5b2facf.zip | |
Migrating to new directory structure adopted from the RealVNC's source tree. Windows part should be complete. For the Unix part, more changes will follow.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@592 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'xc.patch')
| -rw-r--r-- | xc.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/xc.patch b/xc.patch deleted file mode 100644 index a5927b95..00000000 --- a/xc.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -bcr xc.org/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile -*** xc.org/programs/Xserver/Imakefile 2004-12-15 20:22:53.000000000 +0100 ---- xc/programs/Xserver/Imakefile 2005-02-14 14:23:21.000000000 +0100 -*************** -*** 128,134 **** - LIBREGEX = RegexLibrary - - #if DoLoadableServer -! LIBCWRAPPER = os/libcwrapper.o - #endif - - #if BuildXprint ---- 128,134 ---- - LIBREGEX = RegexLibrary - - #if DoLoadableServer -! LIBCWRAPPER = os/libcwrapper.o os/libos.a - #endif - - #if BuildXprint -*************** -*** 414,419 **** ---- 414,430 ---- - #define ServerToInstall Xsun - #endif - #endif /* XsunServer */ -+ XCOMM -+ XCOMM X VNC server -+ XCOMM -+ FBSUBDIR = fb -+ XVNCDDXDIR = vnc/Xvnc -+ XVNCDIRS = $(STDDIRS) $(FBSUBDIR) miext/damage $(XVNCDDXDIR) $(DEPDIRS) -+ XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs -+ XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o -+ XVNCSYSLIBS = $(FONTLIBS) $(SYSLIBS) -+ ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS), \ -+ $(LIBCWRAPPER) $(XVNCLIBS) $(LOADABLEEXTS),$(XVNCSYSLIBS)) - - - #if defined(Xsun24Server) && Xsun24Server -diff -bcr xc.org/programs/Xserver/mi/miinitext.c xc/programs/Xserver/mi/miinitext.c -*** xc.org/programs/Xserver/mi/miinitext.c 2004-12-13 06:48:41.000000000 +0100 ---- xc/programs/Xserver/mi/miinitext.c 2005-02-11 16:47:34.000000000 +0100 -*************** -*** 286,291 **** ---- 286,294 ---- - #ifdef MITMISC - extern void MITMiscExtensionInit(INITARGS); - #endif -+ #ifdef VNCEXT -+ extern void vncExtensionInit(INITARGS); -+ #endif - #ifdef XIDLE - extern void XIdleExtensionInit(INITARGS); - #endif -*************** -*** 587,592 **** ---- 590,598 ---- - #ifdef MITMISC - if (!noMITMiscExtension) MITMiscExtensionInit(); - #endif -+ #ifdef VNCEXT -+ vncExtensionInit(); -+ #endif - #ifdef XIDLE - if (!noXIdleExtension) XIdleExtensionInit(); - #endif |