diff options
Diffstat (limited to 'glcddrivers')
| -rw-r--r-- | glcddrivers/Makefile | 12 | ||||
| -rw-r--r-- | glcddrivers/drivers.c | 18 | ||||
| -rw-r--r-- | glcddrivers/drivers.h | 6 |
3 files changed, 18 insertions, 18 deletions
diff --git a/glcddrivers/Makefile b/glcddrivers/Makefile index 040b1f0..9f70592 100644 --- a/glcddrivers/Makefile +++ b/glcddrivers/Makefile @@ -28,23 +28,23 @@ endif ifeq ($(shell pkg-config --exists libusb && echo 1), 1) DEFINES += -DHAVE_LIBUSB - ifdef HAVE_AX206DPF_EXPERIMENTAL + ifdef HAVE_DRIVER_AX206DPF OBJS += ax206dpf.o INCLUDES += $(shell pkg-config --cflags libusb) LIBS += $(shell pkg-config --libs libusb) - DEFINES += -DHAVE_AX206DPF_EXPERIMENTAL + DEFINES += -DHAVE_DRIVER_AX206DPF endif - ifdef HAVE_picoLCD_256x64_EXPERIMENTAL + ifdef HAVE_DRIVER_picoLCD_256x64 OBJS += picoLCD_256x64.o INCLUDES += $(shell pkg-config --cflags libusb) LIBS += $(shell pkg-config --libs libusb) - DEFINES += -DHAVE_picoLCD_256x64_EXPERIMENTAL + DEFINES += -DHAVE_DRIVER_picoLCD_256x64 endif endif -ifeq ($(WANT_DRV_VNCSERVER), 1) +ifeq ($(HAVE_DRIVER_VNCSERVER), 1) ifeq ($(shell libvncserver-config --version >/dev/null && echo 1), 1) - DEFINES += -DHAVE_LIBVNCSERVER + DEFINES += -DHAVE_DRIVER_VNCSERVER OBJS += vncserver.o INCLUDES += $(shell libvncserver-config --cflags) LIBS += $(shell libvncserver-config --libs) diff --git a/glcddrivers/drivers.c b/glcddrivers/drivers.c index 9aa70ac..e720c0e 100644 --- a/glcddrivers/drivers.c +++ b/glcddrivers/drivers.c @@ -30,13 +30,13 @@ #include "dm140gink.h" #include "serdisp.h" #include "g15daemon.h" -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF #include "ax206dpf.h" #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 #include "picoLCD_256x64.h" #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER #include "vncserver.h" #endif @@ -63,13 +63,13 @@ tDriver drivers[] = {"dm140gink", kDriverDM140GINK}, {"serdisp", kDriverSerDisp}, {"g15daemon", kDriverG15daemon}, -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF {"ax206dpf", kDriverAX206DPF}, #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 {"picolcd256x64", kDriverPicoLCD_256x64}, #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER {"vncserver", kDriverVncServer}, #endif {"", kDriverUnknown} @@ -130,15 +130,15 @@ cDriver * CreateDriver(int driverID, cDriverConfig * config) return new cDriverSerDisp(config); case kDriverG15daemon: return new cDriverG15daemon(config); -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF case kDriverAX206DPF: return new cDriverAX206DPF(config); #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 case kDriverPicoLCD_256x64: return new cDriverPicoLCD_256x64(config); #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER case kDriverVncServer: return new cDriverVncServer(config); #endif diff --git a/glcddrivers/drivers.h b/glcddrivers/drivers.h index c7bbdf8..3968e81 100644 --- a/glcddrivers/drivers.h +++ b/glcddrivers/drivers.h @@ -40,13 +40,13 @@ enum eDriver kDriverNetwork = 14, kDriverGU126X64D_K610A4 = 15, kDriverDM140GINK = 16, -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF kDriverAX206DPF = 17, #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 kDriverPicoLCD_256x64 = 18, #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER kDriverVncServer = 19, #endif kDriverSerDisp = 100, |