diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile | 31 | ||||
| -rw-r--r-- | contrib/zippy.c | 6 |
2 files changed, 32 insertions, 5 deletions
diff --git a/contrib/Makefile b/contrib/Makefile index c1a15fa..8faa4b7 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,3 +1,30 @@ -all: - cd ..; make x11vnc zippy +CFLAGS=-I. -I../include +VNCSERVERLIB=-L.. -lvncserver -L/usr/local/lib -lz -ljpeg -lpthread +LDFLAGS=$(VNCSERVERLIB) +ifdef CXX +LINK=$(CXX) +else +LINK=$(CC) +endif + +# for x11vnc +#XLIBS = -L/usr/X11R6/lib -lXtst -lXext -lX11 +XLIBS = -L/usr/X11R6/lib -L/usr/lib32 -lXtst -lXext -lX11 + +OBJS=*.o + +all: x11vnc zippy + +x11vnc.o: x11vnc.c ../include/rfb.h ../examples/1instance.c Makefile + $(CC) $(CFLAGS) -I. -c -o x11vnc.o x11vnc.c + +x11vnc: x11vnc.o ../libvncserver.a + $(LINK) -g -o x11vnc x11vnc.o $(LDFLAGS) $(XLIBS) + +# Example from Justin +zippy: zippy.o ../libvncserver.a + $(LINK) -o zippy zippy.o $(LDFLAGS) + +clean: + rm -f $(OBJS) *~ core "#"* *.bak *.orig diff --git a/contrib/zippy.c b/contrib/zippy.c index ff2d042..97c139c 100644 --- a/contrib/zippy.c +++ b/contrib/zippy.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <rfb.h> #include <keysym.h> -#include "radon.h" +#include "default8x16.h" int maxx=400, maxy=400, bpp=4; /* odd maxx doesn't work (vncviewer bug) */ @@ -146,7 +146,7 @@ void on_key_press (Bool down,KeySym key,rfbClientPtr cl) case XK_B: rfbUndrawCursor(cl->screen); blank_framebuffer(cl->screen->frameBuffer, 0, 0, maxx, maxy); - rfbDrawString(cl->screen,&radonFont,20,maxy-20,"Hello, World!",0xffffff); + rfbDrawString(cl->screen,&default8x16Font,20,maxy-20,"Hello, World!",0xffffff); rfbMarkRectAsModified(cl->screen,0, 0,maxx,maxy); fprintf (stderr, "Framebuffer blanked\n"); break; @@ -165,7 +165,7 @@ void on_key_press (Bool down,KeySym key,rfbClientPtr cl) case XK_C: case XK_c: rfbUndrawCursor(cl->screen); - rfbDrawString(cl->screen,&radonFont,20,100,"Hello, World!",0xffffff); + rfbDrawString(cl->screen,&default8x16Font,20,100,"Hello, World!",0xffffff); rfbMarkRectAsModified(cl->screen,0, 0,maxx,maxy); break; default: |