From 2d44cfd873767ae123926e830cbe4e5499940050 Mon Sep 17 00:00:00 2001 From: dscho Date: Sun, 15 Dec 2002 19:27:43 +0000 Subject: [PATCH] fix: if no CXX is defined, really don't use zrle (Karl Runge) --- Makefile | 4 ++++ rfbserver.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 67370d3..2e41870 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,14 @@ INCLUDES=-I. VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg +#CXX= CXX=g++ CC=gcc LINK=gcc +# for IRIX +#EXTRALIBS=-L/usr/lib32 + # for Solaris #EXTRALIBS=-lsocket -lnsl -L/usr/X/lib diff --git a/rfbserver.c b/rfbserver.c index ecbc4e6..ec725e9 100644 --- a/rfbserver.c +++ b/rfbserver.c @@ -258,7 +258,9 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP) cl->preferredEncoding = rfbEncodingRaw; cl->correMaxWidth = 48; cl->correMaxHeight = 48; +#ifdef HAVE_ZRLE cl->zrleData = 0; +#endif cl->copyRegion = sraRgnCreate(); cl->copyDX = 0;