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

libfreerdp-locale: rename from libfreerdp-kbd, will contain all localization code

Browse Source
This commit is contained in:
Marc-André Moreau 2012-02-17 17:43:00 -05:00
parent 1b2db232af
commit 61da01973d
27 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -153,11 +153,7 @@ endif()
# Sub-directories
add_subdirectory(include)
add_subdirectory(libfreerdp-utils)
if(NOT WIN32)
add_subdirectory(libfreerdp-kbd)
endif()
add_subdirectory(libfreerdp-locale)
add_subdirectory(libfreerdp-gdi)
add_subdirectory(libfreerdp-rail)
add_subdirectory(libfreerdp-cache)

2
client/DirectFB/CMakeLists.txt
View File

@ -29,7 +29,7 @@ add_executable(dfreerdp
target_link_libraries(dfreerdp freerdp-core)
target_link_libraries(dfreerdp freerdp-gdi)
target_link_libraries(dfreerdp freerdp-kbd)
target_link_libraries(dfreerdp freerdp-locale)
target_link_libraries(dfreerdp freerdp-channels)
target_link_libraries(dfreerdp freerdp-utils)
target_link_libraries(dfreerdp ${DIRECTFB_LIBRARIES})

4
client/DirectFB/df_event.c
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#include <freerdp/kbd/kbd.h>
#include <freerdp/kbd/vkcodes.h>
#include <freerdp/locale/keyboard.h>
#include <freerdp/locale/vkcodes.h>
#include "df_event.h"

2
client/X11/CMakeLists.txt
View File

@ -89,7 +89,7 @@ include_directories(${CMAKE_SOURCE_DIR}/resources)
target_link_libraries(xfreerdp freerdp-core)
target_link_libraries(xfreerdp freerdp-gdi)
target_link_libraries(xfreerdp freerdp-kbd)
target_link_libraries(xfreerdp freerdp-locale)
target_link_libraries(xfreerdp freerdp-rail)
target_link_libraries(xfreerdp freerdp-channels)
target_link_libraries(xfreerdp freerdp-utils)

4
client/X11/xf_event.c
View File

@ -20,8 +20,8 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/kbd/vkcodes.h>
#include <freerdp/locale/keyboard.h>
#include <freerdp/locale/vkcodes.h>
#include "xf_rail.h"
#include "xf_window.h"

4
client/X11/xf_keyboard.h
View File

@ -20,8 +20,8 @@
#ifndef __XF_KEYBOARD_H
#define __XF_KEYBOARD_H
#include <freerdp/kbd/kbd.h>
#include <freerdp/kbd/vkcodes.h>
#include <freerdp/locale/keyboard.h>
#include <freerdp/locale/vkcodes.h>
#include "xfreerdp.h"

2
cunit/CMakeLists.txt
View File

@ -75,5 +75,7 @@ target_link_libraries(test_freerdp freerdp-gdi)
target_link_libraries(test_freerdp freerdp-utils)
target_link_libraries(test_freerdp freerdp-channels)
target_link_libraries(test_freerdp freerdp-codec)
target_link_libraries(test_freerdp freerdp-crypto)
target_link_libraries(test_freerdp freerdp-auth)
add_test(CUnitTests ${EXECUTABLE_OUTPUT_PATH}/test_freerdp)

2
cunit/test_ber.c
View File

@ -22,7 +22,7 @@
#include <freerdp/utils/stream.h>
#include "test_ber.h"
#include "libfreerdp-core/ber.h"
#include <freerdp/crypto/ber.h>
int init_ber_suite(void)
{

3
cunit/test_ntlmssp.c
View File

@ -20,8 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "ntlmssp.h"
#include <freerdp/auth/ntlmssp.h>
#include "test_ntlmssp.h"

2
cunit/test_per.c
View File

@ -22,7 +22,7 @@
#include <freerdp/utils/stream.h>
#include "test_per.h"
#include "libfreerdp-core/per.h"
#include <freerdp/crypto/per.h>
int init_per_suite(void)
{

0
include/freerdp/kbd/kbd.h → include/freerdp/locale/keyboard.h
View File

2
include/freerdp/kbd/layouts.h → include/freerdp/locale/layouts.h
View File

@ -23,7 +23,7 @@
#define __LAYOUT_IDS_H
#include <freerdp/api.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/locale/keyboard.h>
/* Keyboard layout IDs */

0
include/freerdp/kbd/locales.h → include/freerdp/locale/locales.h
View File

2
include/freerdp/kbd/vkcodes.h → include/freerdp/locale/vkcodes.h
View File

@ -24,7 +24,7 @@
#include <stddef.h>
#include <freerdp/api.h>
#include <freerdp/kbd/layouts.h>
#include <freerdp/locale/layouts.h>
/* Mouse buttons */

3
libfreerdp-core/CMakeLists.txt
View File

@ -81,7 +81,7 @@ set(LIBFREERDP_CORE_SRCS
listener.h
peer.c
peer.h
mppc.c
mppc.c
)
add_library(freerdp-core ${LIBFREERDP_CORE_SRCS})
@ -98,6 +98,7 @@ target_link_libraries(freerdp-core freerdp-utils)
target_link_libraries(freerdp-core freerdp-codec)
target_link_libraries(freerdp-core freerdp-crypto)
target_link_libraries(freerdp-core freerdp-auth)
target_link_libraries(freerdp-core freerdp-locale)
install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR})

16
libfreerdp-kbd/CMakeLists.txt → libfreerdp-locale/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# FreeRDP: A Remote Desktop Protocol Client
# libfreerdp-kbd cmake build script
# libfreerdp-locale cmake build script
#
# Copyright 2011 O.S. Systems Software Ltda.
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set(FREERDP_KBD_SRCS
set(FREERDP_LOCALE_SRCS
locales.c
layouts.c
layouts_xkb.c
@ -27,11 +27,11 @@ set(FREERDP_KBD_SRCS
libkbd.c
libkbd.h)
add_library(freerdp-kbd ${FREERDP_KBD_SRCS})
add_library(freerdp-locale ${FREERDP_LOCALE_SRCS})
find_suggested_package(X11)
if(WITH_X11)
target_link_libraries(freerdp-kbd ${X11_LIBRARIES})
target_link_libraries(freerdp-locale ${X11_LIBRARIES})
endif()
if(NOT APPLE)
@ -40,14 +40,16 @@ if(NOT APPLE)
if(WITH_XKBFILE)
add_definitions(-DWITH_XKBFILE)
include_directories(${XKBFILE_INCLUDE_DIRS})
target_link_libraries(freerdp-kbd ${XKBFILE_LIBRARIES})
target_link_libraries(freerdp-locale ${XKBFILE_LIBRARIES})
endif()
endif()
endif()
add_definitions(-DKEYMAP_PATH="${FREERDP_KEYMAP_PATH}")
set_target_properties(freerdp-kbd PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
set_target_properties(freerdp-locale PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
install(TARGETS freerdp-kbd DESTINATION ${CMAKE_INSTALL_LIBDIR})
target_link_libraries(freerdp-locale freerdp-utils)
install(TARGETS freerdp-locale DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
libfreerdp-kbd/layouts.c → libfreerdp-locale/layouts.c
View File

@ -22,7 +22,7 @@
#include <string.h>
#include "libkbd.h"
#include <freerdp/kbd/layouts.h>
#include <freerdp/locale/layouts.h>
typedef struct
{

2
libfreerdp-kbd/layouts_xkb.c → libfreerdp-locale/layouts_xkb.c
View File

@ -29,7 +29,7 @@
#endif
#include "libkbd.h"
#include <freerdp/kbd/vkcodes.h>
#include <freerdp/locale/vkcodes.h>
#include "x_layout_id_table.h"
#include "layouts_xkb.h"

0
libfreerdp-kbd/layouts_xkb.h → libfreerdp-locale/layouts_xkb.h
View File

8
libfreerdp-kbd/libkbd.c → libfreerdp-locale/libkbd.c
View File

@ -21,13 +21,13 @@
#include <stdlib.h>
#include <string.h>
#include <freerdp/types.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/locale/keyboard.h>
#include "libkbd.h"
#include <freerdp/kbd/locales.h>
#include <freerdp/kbd/vkcodes.h>
#include <freerdp/kbd/layouts.h>
#include <freerdp/locale/locales.h>
#include <freerdp/locale/vkcodes.h>
#include <freerdp/locale/layouts.h>
#include "layouts_xkb.h"
/*

0
libfreerdp-kbd/libkbd.h → libfreerdp-locale/libkbd.h
View File

2
libfreerdp-kbd/locales.c → libfreerdp-locale/locales.c
View File

@ -22,7 +22,7 @@
#include <string.h>
#include "libkbd.h"
#include <freerdp/kbd/locales.h>
#include <freerdp/locale/locales.h>
typedef struct
{

2
libfreerdp-kbd/x_layout_id_table.c → libfreerdp-locale/x_layout_id_table.c
View File

@ -22,7 +22,7 @@
#include <string.h>
#include "libkbd.h"
#include <freerdp/kbd/layouts.h>
#include <freerdp/locale/layouts.h>
#include "x_layout_id_table.h"

0
libfreerdp-kbd/x_layout_id_table.h → libfreerdp-locale/x_layout_id_table.h
View File

5
server/X11/CMakeLists.txt
View File

@ -64,6 +64,7 @@ target_link_libraries(xfreerdp-server freerdp-core)
target_link_libraries(xfreerdp-server freerdp-codec)
target_link_libraries(xfreerdp-server freerdp-utils)
target_link_libraries(xfreerdp-server freerdp-gdi)
target_link_libraries(xfreerdp-server freerdp-kbd)
target_link_libraries(xfreerdp-server freerdp-crypto)
target_link_libraries(xfreerdp-server freerdp-auth)
target_link_libraries(xfreerdp-server freerdp-locale)
target_link_libraries(xfreerdp-server ${X11_LIBRARIES})

2
server/X11/xf_input.c
View File

@ -18,7 +18,7 @@
*/
#include <X11/Xlib.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/locale/keyboard.h>
#include "xf_input.h"

2
server/X11/xf_peer.c
View File

@ -27,7 +27,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <sys/select.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/locale/keyboard.h>
#include <freerdp/codec/color.h>
#include <freerdp/utils/file.h>
#include <freerdp/utils/sleep.h>