mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

locale: clarify that WITH_XKBFILE is subordinate to WITH_X11

Browse Source 
This should make no visible change in sane configurations.
This commit is contained in:
Mads Kiilerich 2012-03-24 01:57:09 +01:00
parent 3d57e65a65
commit 9d69c9158c
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libfreerdp-locale/CMakeLists.txt
View File

@ -50,18 +50,17 @@ if(NOT WIN32)
include_directories(${X11_INCLUDE_DIRS})
set(FREERDP_LOCALE_SRCS ${FREERDP_LOCALE_SRCS} ${FREERDP_LOCALE_X11_SRCS})
set(FREERDP_LOCALE_LINK_LIBRARIES ${FREERDP_LOCALE_LINK_LIBRARIES} ${X11_LIBRARIES})
if(NOT APPLE)
find_suggested_package(XKBFile)
if(WITH_XKBFILE)
add_definitions(-DWITH_XKBFILE)
include_directories(${XKBFILE_INCLUDE_DIRS})
set(FREERDP_LOCALE_SRCS ${FREERDP_LOCALE_SRCS} ${FREERDP_LOCALE_XKBFILE_SRCS})
set(FREERDP_LOCALE_LINK_LIBRARIES ${FREERDP_LOCALE_LINK_LIBRARIES} ${XKBFILE_LIBRARIES})
endif()
endif()
if(WITH_SUN)
add_definitions(-DWITH_SUN)
set(FREERDP_LOCALE_SRCS ${FREERDP_LOCALE_SRCS} ${FREERDP_LOCALE_SUN_SRCS})
elseif(NOT APPLE)
find_suggested_package(XKBFile)
endif()
if(WITH_XKBFILE)
add_definitions(-DWITH_XKBFILE)
include_directories(${XKBFILE_INCLUDE_DIRS})
set(FREERDP_LOCALE_SRCS ${FREERDP_LOCALE_SRCS} ${FREERDP_LOCALE_XKBFILE_SRCS})
set(FREERDP_LOCALE_LINK_LIBRARIES ${FREERDP_LOCALE_LINK_LIBRARIES} ${XKBFILE_LIBRARIES})
endif()
endif()
endif()

8
libfreerdp-locale/keyboard.c
View File

@ -30,7 +30,6 @@
#ifdef WITH_X11
#include "keyboard_x11.h"
#endif
#ifdef WITH_XKBFILE
#include "keyboard_xkbfile.h"
@ -40,6 +39,8 @@
#include "keyboard_sun.h"
#endif
#endif
#include <freerdp/locale/locale.h>
#include <freerdp/locale/keyboard.h>
@ -244,14 +245,13 @@ uint32 freerdp_detect_keyboard(uint32 keyboardLayoutID)
uint32 freerdp_keyboard_init(uint32 keyboardLayoutId)
{
#ifdef WITH_X11
#ifdef WITH_XKBFILE
keyboardLayoutId = freerdp_keyboard_init_xkbfile(keyboardLayoutId);
if (keyboardLayoutId == 0)
keyboardLayoutId = freerdp_keyboard_init_x11(keyboardLayoutId);
#else
#ifdef WITH_X11
keyboardLayoutId = freerdp_keyboard_init_x11(keyboardLayoutId);
#endif