Author: bonefish Date: 2009-11-26 11:14:21 +0100 (Thu, 26 Nov 2009) New Revision: 34270 Changeset: http://dev.haiku-os.org/changeset/34270/haiku Modified: haiku/trunk/src/tools/bfs_shell/Jamfile haiku/trunk/src/tools/fs_shell/Jamfile Log: Don't include HaikuBuildCompatibility.h in the [b]fs_shell build. It's not needed -- the code has its own complete platform abstraction layer -- and only causes problems. Modified: haiku/trunk/src/tools/bfs_shell/Jamfile =================================================================== --- haiku/trunk/src/tools/bfs_shell/Jamfile 2009-11-26 10:06:10 UTC (rev 34269) +++ haiku/trunk/src/tools/bfs_shell/Jamfile 2009-11-26 10:14:21 UTC (rev 34270) @@ -2,6 +2,9 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems bfs ] ; +# prevent inclusion of HaikuBuildCompatibility.h +DEFINES += HAIKU_BUILD_COMPATIBILITY_H ; + # set some additional defines { local defines = Modified: haiku/trunk/src/tools/fs_shell/Jamfile =================================================================== --- haiku/trunk/src/tools/fs_shell/Jamfile 2009-11-26 10:06:10 UTC (rev 34269) +++ haiku/trunk/src/tools/fs_shell/Jamfile 2009-11-26 10:14:21 UTC (rev 34270) @@ -14,10 +14,11 @@ UsePrivateHeaders fs_shell ; UsePrivateHeaders shared ; -local defines = [ FDefines FS_SHELL=1 ] ; -SubDirCcFlags $(defines) ; -SubDirC++Flags $(defines) ; +DEFINES += FS_SHELL=1 ; +# prevent inclusion of HaikuBuildCompatibility.h +DEFINES += HAIKU_BUILD_COMPATIBILITY_H ; + # platform specific sources/libraries local fsShellCommandSources ; local externalCommandsSources ;