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

* Fixed build on the Haiku platform.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36375 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-20 16:18:39 +00:00
parent 6e83a6fac9
commit a41cc8a74b
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/shared/Keymap.cpp
+3 -3
View File
@@ -19,7 +19,7 @@
#include <ByteOrder.h> #include <ByteOrder.h>
#include <File.h> #include <File.h>
#if (defined(__BEOS__) || defined(__HAIKU__)) #ifdef HAIKU_TARGET_PLATFORM_HAIKU
# include "SystemKeymap.h" # include "SystemKeymap.h"
// generated by the build system // generated by the build system
#endif #endif
@@ -112,7 +112,7 @@ BKeymap::SetTo(BDataIO& stream)
status_t status_t
BKeymap::SetToCurrent() BKeymap::SetToCurrent()
{ {
#if (defined(__BEOS__) || defined(__HAIKU__)) #ifdef HAIKU_TARGET_PLATFORM_HAIKU
key_map* keys = NULL; key_map* keys = NULL;
get_key_map(&keys, &fChars); get_key_map(&keys, &fChars);
if (!keys) if (!keys)
@@ -131,7 +131,7 @@ BKeymap::SetToCurrent()
status_t status_t
BKeymap::SetToDefault() BKeymap::SetToDefault()
{ {
#if (defined(__BEOS__) || defined(__HAIKU__)) #ifdef HAIKU_TARGET_PLATFORM_HAIKU
fKeys = kSystemKeymap; fKeys = kSystemKeymap;
fCharsSize = kSystemKeyCharsSize; fCharsSize = kSystemKeyCharsSize;
src/tools/keymap/Jamfile
+14 -4
View File
@@ -7,19 +7,29 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin keymap ] ;
USES_BE_API on <build>keymap = true ; USES_BE_API on <build>keymap = true ;
local reSources ; local regexSources ;
local storageSources ;
if $(HOST_PLATFORM) = cygwin || $(HOST_PLATFORM) = sunos { if $(HOST_PLATFORM) = cygwin || $(HOST_PLATFORM) = sunos {
reSources = regex.c ; regexSources = regex.c ;
}
if $(HOST_PLATFORM) = haiku_host {
# those are missing from early Haiku builds
storageSources = FileIO.cpp ;
} }
BuildPlatformMain <build>keymap : BuildPlatformMain <build>keymap :
main.cpp main.cpp
Keymap.cpp Keymap.cpp
$(reSources) $(regexSources)
$(storageSources)
: libshared_build.a $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) : libshared_build.a $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
; ;
LinkAgainst <build>keymap : $(HOST_LIBBE) ; LinkAgainst <build>keymap : $(HOST_LIBBE) ;
SEARCH on [ FGristFiles $(reSources) ] SEARCH on [ FGristFiles $(regexSources) ]
= [ FDirName $(HAIKU_TOP) src system libroot posix glibc regex ] ; = [ FDirName $(HAIKU_TOP) src system libroot posix glibc regex ] ;
SEARCH on [ FGristFiles $(storageSources) ]
= [ FDirName $(HAIKU_TOP) src kits storage ] ;