Commit a73243f8 authored by dscho's avatar dscho

another solaris clean compile

parent b2865b4f
solaris compile cleanups
many x11vnc improvements
added backchannel, an encoding which needs special clients to pass added backchannel, an encoding which needs special clients to pass
arbitrary data to the client arbitrary data to the client
changes from Tim Jansen regarding multi threading and client blocking changes from Tim Jansen regarding multi threading and client blocking
as well as C++ compliancy as well as C++ compliancy
x11vnc can be controlled by restarting with special options if compiling x11vnc can be controlled by starting again with special options if compiling
with LOCAL_CONTROL defined with LOCAL_CONTROL defined
0.3 0.3
added x11vnc, a x0rfbserver clone added x11vnc, a x0rfbserver clone
......
INCLUDES=-I. INCLUDES=-I.
VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg
# for Solaris
EXTRALIBS=-lsocket -lnsl -L/usr/X/lib
# Uncomment these two lines to enable use of PThreads # Uncomment these two lines to enable use of PThreads
#PTHREADDEF = -DHAVE_PTHREADS #PTHREADDEF = -DHAVE_PTHREADS
#PTHREADLIB = -lpthread #PTHREADLIB = -lpthread
...@@ -14,7 +17,7 @@ OPTFLAGS=-g -Wall ...@@ -14,7 +17,7 @@ OPTFLAGS=-g -Wall
CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES) -DBACKCHANNEL CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES) -DBACKCHANNEL
RANLIB=ranlib RANLIB=ranlib
LIBS=$(LDFLAGS) $(VNCSERVERLIB) $(PTHREADLIB) LIBS=$(LDFLAGS) $(VNCSERVERLIB) $(PTHREADLIB) $(EXTRALIBS)
# for Mac OS X # for Mac OS X
OSX_LIBS = -framework ApplicationServices -framework Carbon OSX_LIBS = -framework ApplicationServices -framework Carbon
...@@ -62,7 +65,7 @@ OSXvnc-server: mac.o libvncserver.a ...@@ -62,7 +65,7 @@ OSXvnc-server: mac.o libvncserver.a
x11vnc.o: x11vnc.c 1instance.c x11vnc.o: x11vnc.c 1instance.c
x11vnc: x11vnc.o libvncserver.a x11vnc: x11vnc.o libvncserver.a
$(CC) -o x11vnc x11vnc.o libvncserver.a -lz -ljpeg $(XLIBS) $(CC) -o x11vnc x11vnc.o $(LIBS) $(XLIBS)
x11vnc_static: x11vnc.o libvncserver.a x11vnc_static: x11vnc.o libvncserver.a
$(CC) -o x11vnc_static x11vnc.o libvncserver.a /usr/lib/libz.a /usr/lib/libjpeg.a $(XLIBS) $(CC) -o x11vnc_static x11vnc.o libvncserver.a /usr/lib/libz.a /usr/lib/libjpeg.a $(XLIBS)
......
...@@ -66,15 +66,9 @@ typedef unsigned long KeySym; ...@@ -66,15 +66,9 @@ typedef unsigned long KeySym;
#include <sys/types.h> #include <sys/types.h>
#if defined(__sparc) #if defined(__sparc)
/* SPARC here (big endian) */ /* SPARC here (big endian) */
#ifndef _BIG_ENDIAN #define _BYTE_ORDER 4321
#define _BIG_ENDIAN 4321
#endif
#define _BYTE_ORDER _BIG_ENDIAN
#elif defined(__i386) #elif defined(__i386)
#ifndef _LITTLE_ENDIAN #define _BYTE_ORDER 1234
#define _LITTLE_ENDIAN 1234
#endif
#define _BYTE_ORDER _LITTLE_ENDIAN
#else #else
#error Solaris 2.5.1 had ppc support did it not? :-) #error Solaris 2.5.1 had ppc support did it not? :-)
#endif #endif
...@@ -98,7 +92,7 @@ typedef unsigned long KeySym; ...@@ -98,7 +92,7 @@ typedef unsigned long KeySym;
#define _BYTE_ORDER __BYTE_ORDER #define _BYTE_ORDER __BYTE_ORDER
#endif #endif
#ifndef _LITTLE_ENDIAN #if !defined(_LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN)
#define _LITTLE_ENDIAN __LITTLE_ENDIAN #define _LITTLE_ENDIAN __LITTLE_ENDIAN
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment