i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* We cannot include the SystemKeymap.h with the tool that is supposed to

Browse Source 
generate it.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36370 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-20 12:38:41 +00:00
parent 76d5e0641b
commit 4dfce2e401
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build/libshared/Jamfile
-3
View File
@@ -3,13 +3,10 @@ SubDir HAIKU_TOP src build libbe ;
USES_BE_API on libshared_build.a = true ; USES_BE_API on libshared_build.a = true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
UseHeaders [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) servers input ] ;
BuildPlatformStaticLibrary libshared_build.a : BuildPlatformStaticLibrary libshared_build.a :
Keymap.cpp Keymap.cpp
; ;
Includes [ FGristFiles Keymap.cpp ] : <src!servers!input>SystemKeymap.h ;
SEARCH on [ FGristFiles Keymap.cpp ] SEARCH on [ FGristFiles Keymap.cpp ]
= [ FDirName $(HAIKU_TOP) src kits shared ] ; = [ FDirName $(HAIKU_TOP) src kits shared ] ;
src/kits/shared/Keymap.cpp
+7
View File
@@ -19,8 +19,10 @@
#include <ByteOrder.h> #include <ByteOrder.h>
#include <File.h> #include <File.h>
#if (defined(__BEOS__) || defined(__HAIKU__))
# include "SystemKeymap.h" # include "SystemKeymap.h"
// generated by the build system // generated by the build system
#endif
// Private only at this point, as we might want to improve the dead key // Private only at this point, as we might want to improve the dead key
@@ -129,6 +131,7 @@ BKeymap::SetToCurrent()
status_t status_t
BKeymap::SetToDefault() BKeymap::SetToDefault()
{ {
#if (defined(__BEOS__) || defined(__HAIKU__))
fKeys = kSystemKeymap; fKeys = kSystemKeymap;
fCharsSize = kSystemKeyCharsSize; fCharsSize = kSystemKeyCharsSize;
@@ -140,6 +143,10 @@ BKeymap::SetToDefault()
memcpy(fChars, kSystemKeyChars, fCharsSize); memcpy(fChars, kSystemKeyChars, fCharsSize);
return B_OK; return B_OK;
#else // ! __BEOS__
fprintf(stderr, "Unsupported operation on this platform!\n");
exit(1);
#endif // ! __BEOS__
} }