From 4dfce2e401f26b780baca36eb70f345be821f737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 20 Apr 2010 12:38:41 +0000 Subject: [PATCH] * We cannot include the SystemKeymap.h with the tool that is supposed to generate it. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36370 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/build/libshared/Jamfile | 3 --- src/kits/shared/Keymap.cpp | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/build/libshared/Jamfile b/src/build/libshared/Jamfile index 73ca5182c4..203e1cd3a3 100644 --- a/src/build/libshared/Jamfile +++ b/src/build/libshared/Jamfile @@ -3,13 +3,10 @@ SubDir HAIKU_TOP src build libbe ; USES_BE_API on libshared_build.a = true ; UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ; -UseHeaders [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) servers input ] ; BuildPlatformStaticLibrary libshared_build.a : Keymap.cpp ; -Includes [ FGristFiles Keymap.cpp ] : SystemKeymap.h ; - SEARCH on [ FGristFiles Keymap.cpp ] = [ FDirName $(HAIKU_TOP) src kits shared ] ; diff --git a/src/kits/shared/Keymap.cpp b/src/kits/shared/Keymap.cpp index 44ec6c4751..4c8206485c 100644 --- a/src/kits/shared/Keymap.cpp +++ b/src/kits/shared/Keymap.cpp @@ -19,8 +19,10 @@ #include #include -#include "SystemKeymap.h" +#if (defined(__BEOS__) || defined(__HAIKU__)) +# include "SystemKeymap.h" // generated by the build system +#endif // Private only at this point, as we might want to improve the dead key @@ -129,6 +131,7 @@ BKeymap::SetToCurrent() status_t BKeymap::SetToDefault() { +#if (defined(__BEOS__) || defined(__HAIKU__)) fKeys = kSystemKeymap; fCharsSize = kSystemKeyCharsSize; @@ -140,6 +143,10 @@ BKeymap::SetToDefault() memcpy(fChars, kSystemKeyChars, fCharsSize); return B_OK; +#else // ! __BEOS__ + fprintf(stderr, "Unsupported operation on this platform!\n"); + exit(1); +#endif // ! __BEOS__ }