[haiku-commits] r36370 - in haiku/trunk/src: build/libshared kits/shared
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 20 Apr 2010 14:38:41 +0200 (CEST)
Author: axeld
Date: 2010-04-20 14:38:41 +0200 (Tue, 20 Apr 2010)
New Revision: 36370
Changeset: http://dev.haiku-os.org/changeset/36370/haiku
Modified:
haiku/trunk/src/build/libshared/Jamfile
haiku/trunk/src/kits/shared/Keymap.cpp
Log:
* We cannot include the SystemKeymap.h with the tool that is supposed to
generate it.
Modified: haiku/trunk/src/build/libshared/Jamfile
===================================================================
--- haiku/trunk/src/build/libshared/Jamfile 2010-04-20 12:37:08 UTC (rev
36369)
+++ haiku/trunk/src/build/libshared/Jamfile 2010-04-20 12:38:41 UTC (rev
36370)
@@ -3,13 +3,10 @@
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 ] : <src!servers!input>SystemKeymap.h ;
-
SEARCH on [ FGristFiles Keymap.cpp ]
= [ FDirName $(HAIKU_TOP) src kits shared ] ;
Modified: haiku/trunk/src/kits/shared/Keymap.cpp
===================================================================
--- haiku/trunk/src/kits/shared/Keymap.cpp 2010-04-20 12:37:08 UTC (rev
36369)
+++ haiku/trunk/src/kits/shared/Keymap.cpp 2010-04-20 12:38:41 UTC (rev
36370)
@@ -19,8 +19,10 @@
#include <ByteOrder.h>
#include <File.h>
-#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 @@
status_t
BKeymap::SetToDefault()
{
+#if (defined(__BEOS__) || defined(__HAIKU__))
fKeys = kSystemKeymap;
fCharsSize = kSystemKeyCharsSize;
@@ -140,6 +143,10 @@
memcpy(fChars, kSystemKeyChars, fCharsSize);
return B_OK;
+#else // ! __BEOS__
+ fprintf(stderr, "Unsupported operation on this platform!\n");
+ exit(1);
+#endif // ! __BEOS__
}
Other related posts:
- » [haiku-commits] r36370 - in haiku/trunk/src: build/libshared kits/shared - axeld
