From 1956c146ea0ef028fc4b1dceeae34fb39c73a09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 8 Jan 2006 13:19:12 +0000 Subject: [PATCH] bfs_shell now also builds under Linux/PPC, not tested yet, though. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15868 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/build/libroot/byteorder.cpp | 6 +++++- src/tests/add-ons/kernel/file_systems/fs_shell/Jamfile | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/build/libroot/byteorder.cpp b/src/build/libroot/byteorder.cpp index af94714fad..fdcbf328ae 100644 --- a/src/build/libroot/byteorder.cpp +++ b/src/build/libroot/byteorder.cpp @@ -1,5 +1,9 @@ -#include +#ifdef BUILDING_FS_SHELL +# include "compat.h" +#else +# include +#endif #include diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/fs_shell/Jamfile index 6d41238ca5..c5265b080b 100644 --- a/src/tests/add-ons/kernel/file_systems/fs_shell/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/fs_shell/Jamfile @@ -12,6 +12,7 @@ include [ FDirName $(HAIKU_TOP) src tests add-ons kernel file_systems fs_shell local fsShellCommandSources ; local externalCommandsSources ; local attributeSupportSources ; +local byteOrderSupportSources ; if $(HOST_PLATFORM_BEOS_COMPATIBLE) { fsShellCommandSources = fs_shell_command_beos.cpp ; externalCommandsSources = external_commands_beos.cpp ; @@ -19,6 +20,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) { fsShellCommandSources = fs_shell_command_unix.cpp ; externalCommandsSources = external_commands_unix.cpp ; attributeSupportSources = fs_attr.cpp ; + byteOrderSupportSources = byteorder.cpp ; } SetupFSShellIncludes ; @@ -54,12 +56,12 @@ BuildLibFSShell libfs_shell.a stub.c tracker.cpp sysdep.c hexdump.c argv.c errors.cpp xcp.cpp path_util.cpp stat_util.cpp $(attributeSupportSources) + $(byteOrderSupportSources) ; -SEARCH on [ FGristFiles fs_attr.cpp ] +SEARCH on [ FGristFiles fs_attr.cpp byteorder.cpp ] = [ FDirName $(HAIKU_TOP) src build libroot ] ; - # fs_shell_command BuildPlatformMain fs_shell_command