diff options
| -rw-r--r-- | Makefile.objs | 4 | ||||
| -rw-r--r-- | ui/vnc-enc-hextile-template.h (renamed from ui/vnchextile.h) | 0 | ||||
| -rw-r--r-- | ui/vnc-enc-hextile.c (renamed from ui/vnc-encoding-hextile.c) | 12 | ||||
| -rw-r--r-- | ui/vnc-enc-tight.c (renamed from ui/vnc-encoding-tight.c) | 2 | ||||
| -rw-r--r-- | ui/vnc-enc-tight.h (renamed from ui/vnc-encoding-tight.h) | 0 | ||||
| -rw-r--r-- | ui/vnc-enc-zlib.c (renamed from ui/vnc-encoding-zlib.c) | 0 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.objs b/Makefile.objs index 43b4e169e3..a0b8200432 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,8 +106,8 @@ ui-obj-y += keymaps.o ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o ui-obj-$(CONFIG_CURSES) += curses.o ui-obj-y += vnc.o d3des.o -ui-obj-y += vnc-encoding-zlib.o vnc-encoding-hextile.o -ui-obj-y += vnc-encoding-tight.o +ui-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o +ui-obj-y += vnc-enc-tight.o ui-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o ui-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o ui-obj-$(CONFIG_COCOA) += cocoa.o diff --git a/ui/vnchextile.h b/ui/vnc-enc-hextile-template.h index b9f9f5ef89..b9f9f5ef89 100644 --- a/ui/vnchextile.h +++ b/ui/vnc-enc-hextile-template.h diff --git a/ui/vnc-encoding-hextile.c b/ui/vnc-enc-hextile.c index 728f25e5d8..fa4b2640f8 100644 --- a/ui/vnc-encoding-hextile.c +++ b/ui/vnc-enc-hextile.c @@ -33,32 +33,32 @@ static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h) } #define BPP 8 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define BPP 16 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define BPP 32 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define GENERIC #define BPP 8 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC #define GENERIC #define BPP 16 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC #define GENERIC #define BPP 32 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC diff --git a/ui/vnc-encoding-tight.c b/ui/vnc-enc-tight.c index c1a292bdd2..358221dc06 100644 --- a/ui/vnc-encoding-tight.c +++ b/ui/vnc-enc-tight.c @@ -37,7 +37,7 @@ #include "qdict.h" #include "qint.h" #include "vnc.h" -#include "vnc-encoding-tight.h" +#include "vnc-enc-tight.h" /* Compression level stuff. The following array contains various encoder parameters for each of 10 compression levels (0..9). diff --git a/ui/vnc-encoding-tight.h b/ui/vnc-enc-tight.h index 9b0910c79a..9b0910c79a 100644 --- a/ui/vnc-encoding-tight.h +++ b/ui/vnc-enc-tight.h diff --git a/ui/vnc-encoding-zlib.c b/ui/vnc-enc-zlib.c index a99bc387dc..a99bc387dc 100644 --- a/ui/vnc-encoding-zlib.c +++ b/ui/vnc-enc-zlib.c |