[haiku-commits] r36375 - in haiku/trunk/src: kits/shared tools/keymap

From: axeld@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 20 Apr 2010 18:18:39 +0200 (CEST)
Author: axeld
Date: 2010-04-20 18:18:39 +0200 (Tue, 20 Apr 2010)
New Revision: 36375
Changeset: http://dev.haiku-os.org/changeset/36375/haiku

Modified:
   haiku/trunk/src/kits/shared/Keymap.cpp
   haiku/trunk/src/tools/keymap/Jamfile
Log:
* Fixed build on the Haiku platform.


Modified: haiku/trunk/src/kits/shared/Keymap.cpp
===================================================================
--- haiku/trunk/src/kits/shared/Keymap.cpp      2010-04-20 15:10:09 UTC (rev 
36374)
+++ haiku/trunk/src/kits/shared/Keymap.cpp      2010-04-20 16:18:39 UTC (rev 
36375)
@@ -19,7 +19,7 @@
 #include <ByteOrder.h>
 #include <File.h>
 
-#if (defined(__BEOS__) || defined(__HAIKU__))
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 #      include "SystemKeymap.h"
        // generated by the build system
 #endif
@@ -112,7 +112,7 @@
 status_t
 BKeymap::SetToCurrent()
 {
-#if (defined(__BEOS__) || defined(__HAIKU__))
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
        key_map* keys = NULL;
        get_key_map(&keys, &fChars);
        if (!keys)
@@ -131,7 +131,7 @@
 status_t
 BKeymap::SetToDefault()
 {
-#if (defined(__BEOS__) || defined(__HAIKU__))
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
        fKeys = kSystemKeymap;
        fCharsSize = kSystemKeyCharsSize;
 

Modified: haiku/trunk/src/tools/keymap/Jamfile
===================================================================
--- haiku/trunk/src/tools/keymap/Jamfile        2010-04-20 15:10:09 UTC (rev 
36374)
+++ haiku/trunk/src/tools/keymap/Jamfile        2010-04-20 16:18:39 UTC (rev 
36375)
@@ -7,19 +7,29 @@
 
 USES_BE_API on <build>keymap = true ;
 
-local reSources ;
+local regexSources ;
+local storageSources ;
+
 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 :
        main.cpp
        Keymap.cpp
-       $(reSources)
+       $(regexSources)
+       $(storageSources)
        : libshared_build.a $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
 ;
 
 LinkAgainst <build>keymap : $(HOST_LIBBE) ;
 
-SEARCH on [ FGristFiles $(reSources) ]
+SEARCH on [ FGristFiles $(regexSources) ]
        = [ FDirName $(HAIKU_TOP) src system libroot posix glibc regex ] ;
+
+SEARCH on [ FGristFiles $(storageSources) ]
+       = [ FDirName $(HAIKU_TOP) src kits storage ] ;
[haiku-commits] r36375 - in haiku/trunk/src: kits/shared tools/keymap

Other related posts:
