Finally working compile.
This commit is contained in:
parent
0e4dcff4f5
commit
14fedacfc7
@ -363,6 +363,15 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <winpr/wtypes.h>
|
|||||||
rdpBitmap b = { .Decompress = __decompress };]])],,
|
rdpBitmap b = { .Decompress = __decompress };]])],,
|
||||||
[AC_DEFINE([LEGACY_RDPBITMAP])])
|
[AC_DEFINE([LEGACY_RDPBITMAP])])
|
||||||
|
|
||||||
|
#
|
||||||
|
# FreeRDP: rdpPalette
|
||||||
|
#
|
||||||
|
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <freerdp/update.h>
|
||||||
|
rdpPalette p;
|
||||||
|
PALETTE_ENTRY* foo = p.entries;]])],,
|
||||||
|
[AC_DEFINE([LEGACY_RDPPALETTE])])
|
||||||
|
|
||||||
#
|
#
|
||||||
# FreeRDP: wMessage / RDP_EVENT
|
# FreeRDP: wMessage / RDP_EVENT
|
||||||
#
|
#
|
||||||
|
@ -462,7 +462,11 @@ void guac_rdp_gdi_palette_update(rdpContext* context, PALETTE_UPDATE* palette) {
|
|||||||
|
|
||||||
CLRCONV* clrconv = ((rdp_freerdp_context*) context)->clrconv;
|
CLRCONV* clrconv = ((rdp_freerdp_context*) context)->clrconv;
|
||||||
clrconv->palette->count = palette->number;
|
clrconv->palette->count = palette->number;
|
||||||
|
#ifdef LEGACY_RDPPALETTE
|
||||||
clrconv->palette->entries = palette->entries;
|
clrconv->palette->entries = palette->entries;
|
||||||
|
#else
|
||||||
|
memcpy(clrconv->palette->entries, palette->entries, sizeof(palette->entries));
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -145,7 +145,7 @@ void guac_rdp_glyph_begindraw(rdpContext* context,
|
|||||||
|
|
||||||
/* Convert foreground color */
|
/* Convert foreground color */
|
||||||
fgcolor = freerdp_color_convert_var(fgcolor,
|
fgcolor = freerdp_color_convert_var(fgcolor,
|
||||||
context->instance->settings->color_depth, 32,
|
guac_client_data->settings.color_depth, 32,
|
||||||
((rdp_freerdp_context*) context)->clrconv);
|
((rdp_freerdp_context*) context)->clrconv);
|
||||||
|
|
||||||
/* Fill background with color if specified */
|
/* Fill background with color if specified */
|
||||||
@ -161,7 +161,7 @@ void guac_rdp_glyph_begindraw(rdpContext* context,
|
|||||||
|
|
||||||
/* Convert background color */
|
/* Convert background color */
|
||||||
bgcolor = freerdp_color_convert_var(bgcolor,
|
bgcolor = freerdp_color_convert_var(bgcolor,
|
||||||
context->instance->settings->color_depth, 32,
|
guac_client_data->settings.color_depth, 32,
|
||||||
((rdp_freerdp_context*) context)->clrconv);
|
((rdp_freerdp_context*) context)->clrconv);
|
||||||
|
|
||||||
/* Fill background */
|
/* Fill background */
|
||||||
|
@ -41,6 +41,8 @@
|
|||||||
#include <freerdp/freerdp.h>
|
#include <freerdp/freerdp.h>
|
||||||
#include <guacamole/client.h>
|
#include <guacamole/client.h>
|
||||||
|
|
||||||
|
#include "rdp_keymap.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The default RDP port.
|
* The default RDP port.
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user