diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2013-05-20 20:05:59 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2013-05-20 20:05:59 +0200 |
| commit | f95a223b03053791c3192ce472cc63c4bfcb221c (patch) | |
| tree | ad3547a304186ebb6335aaab3bae6aa4294ad25b | |
| parent | 53ecd69c4f75db510098b1c5b911684806198756 (diff) | |
| parent | 4ae6e46e34e8a5cc4fa4c333e44a64d58597da55 (diff) | |
| download | graphlcd-base-f95a223b03053791c3192ce472cc63c4bfcb221c.tar.gz graphlcd-base-f95a223b03053791c3192ce472cc63c4bfcb221c.tar.bz2 | |
Merge branch 'touchcol' of ssh://projects.vdr-developer.org/graphlcd-base into touchcol
| -rw-r--r-- | Make.config | 3 | ||||
| -rw-r--r-- | glcddrivers/Makefile | 2 | ||||
| -rw-r--r-- | graphlcd.conf | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Make.config b/Make.config index 9e82ca9..f782845 100644 --- a/Make.config +++ b/Make.config @@ -73,6 +73,9 @@ HAVE_FONTCONFIG=1 #HAVE_IMAGEMAGICK=1 #HAVE_GRAPHICSMAGICK=1 +# comment this variable or set to 0 if you do not want to build the vncserver driver, even if requirements (libvncserver) are fullfilled on the system +WANT_DRV_VNCSERVER=1 + # uncomment this variable if you want to enable the experimental AX 206 based digital photo frame driver # Read DRIVER.ax206dpf before use! #HAVE_AX206DPF_EXPERIMENTAL=1 diff --git a/glcddrivers/Makefile b/glcddrivers/Makefile index 8287bb2..040b1f0 100644 --- a/glcddrivers/Makefile +++ b/glcddrivers/Makefile @@ -42,12 +42,14 @@ ifeq ($(shell pkg-config --exists libusb && echo 1), 1) endif endif +ifeq ($(WANT_DRV_VNCSERVER), 1) ifeq ($(shell libvncserver-config --version >/dev/null && echo 1), 1) DEFINES += -DHAVE_LIBVNCSERVER OBJS += vncserver.o INCLUDES += $(shell libvncserver-config --cflags) LIBS += $(shell libvncserver-config --libs) endif +endif ### Implicit rules: diff --git a/graphlcd.conf b/graphlcd.conf index ed623d6..ef65bbf 100644 --- a/graphlcd.conf +++ b/graphlcd.conf @@ -506,8 +506,8 @@ Height=64 #UpsideDown=no #Invert=no Brightness=50 -#AdjustTiming=0 # not used -#RefreshDisplay=0 # not used +AdjustTiming=50 +RefreshDisplay=50 # Wiring # Select the type of wiring your display is connected with. |