summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile.am27
-rw-r--r--examples/android/Makefile.am7
-rw-r--r--examples/example.c2
-rw-r--r--examples/vncev.c3
-rw-r--r--examples/zippy.c2
5 files changed, 4 insertions, 37 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index 829f735..0000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)
-LDADD = ../libvncserver/libvncserver.la @WSOCKLIB@
-
-if OSX
-MAC=mac
-mac_LDFLAGS=-framework ApplicationServices -framework Carbon -framework IOKit
-endif
-
-if ANDROID
-SUBDIRS=android
-endif
-
-if WITH_TIGHTVNC_FILETRANSFER
-FILETRANSFER=filetransfer
-endif
-
-if HAVE_LIBPTHREAD
-BLOOPTEST=blooptest
-endif
-
-noinst_HEADERS=radon.h rotatetemplate.c
-
-noinst_PROGRAMS=example pnmshow regiontest pnmshow24 fontsel \
- vncev storepasswd colourmaptest simple simple15 $(MAC) \
- $(FILETRANSFER) backchannel $(BLOOPTEST) camera rotate \
- zippy repeater
-
diff --git a/examples/android/Makefile.am b/examples/android/Makefile.am
deleted file mode 100644
index 9cb5c02..0000000
--- a/examples/android/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)
-LDADD = $(top_srcdir)/libvncserver/libvncserver.la @WSOCKLIB@
-
-noinst_PROGRAMS=androidvncserver
-androidvncserver_SOURCES=jni/fbvncserver.c
-
-EXTRA_DIST=jni/Android.mk
diff --git a/examples/example.c b/examples/example.c
index 617e7ad..406378e 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -56,7 +56,7 @@ static void initBuffer(unsigned char* buffer)
}
}
-/* Here we create a structure so that every client has it's own pointer */
+/* Here we create a structure so that every client has its own pointer */
typedef struct ClientData {
rfbBool oldButton;
diff --git a/examples/vncev.c b/examples/vncev.c
index b185746..4051d2b 100644
--- a/examples/vncev.c
+++ b/examples/vncev.c
@@ -5,10 +5,11 @@
#ifdef __STRICT_ANSI__
#define _BSD_SOURCE
#endif
+#include <rfb/rfbconfig.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
-#ifndef __MINGW32__
+#if LIBVNCSERVER_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#include <rfb/rfb.h>
diff --git a/examples/zippy.c b/examples/zippy.c
index 5a5961a..be06a28 100644
--- a/examples/zippy.c
+++ b/examples/zippy.c
@@ -7,7 +7,7 @@
static int maxx=400, maxy=400, bpp=4;
/* odd maxx doesn't work (vncviewer bug) */
-/* Here we create a structure so that every client has it's own pointer */
+/* Here we create a structure so that every client has its own pointer */
/* turns the framebuffer black */
void blank_framebuffer(char* frame_buffer, int x1, int y1, int x2, int y2);