From ba98d1b0cd312a0b9a9f1bf3d3dcf66c0ae32ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 11 Nov 2005 13:50:26 +0000 Subject: [PATCH] * Terminal is now also built for the libbe_test platform; removed explicit linking against libroot.so. * libtracker.so is now also built for that one, and also removed libroot.so linking. * MiniTerminal is no longer build for the libbe_test platform. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14854 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/terminal/Jamfile | 14 ++++++++++---- src/apps/terminal/TermWindow.cpp | 2 ++ src/kits/tracker/Jamfile | 9 ++++++--- src/tests/apps/miniterminal/Jamfile | 6 ------ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile index 29034f1223..c2e20ab9a6 100644 --- a/src/apps/terminal/Jamfile +++ b/src/apps/terminal/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src apps terminal ; +AddSubDirSupportedPlatforms libbe_test ; + Application Terminal : AppearPrefView.cpp CodeConv.cpp @@ -20,12 +22,16 @@ Application Terminal : UTF8WidthTbl.c VTKeyTbl.c VTPrsTbl.c - : libbe.so libtracker.so libtextencoding.so libgame.so + : be libtracker.so libtextencoding.so : Terminal.rdef Terminal.icons.rdef Terminal.version.rdef ; if $(TARGET_PLATFORM) = haiku { - # link for Haiku - - LinkAgainst Terminal : libroot.so ; + # link for Haiku + LinkAgainst Terminal : libgame.so ; +} + +if $(TARGET_PLATFORM) = libbe_test { + HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Terminal + : tests!apps ; } diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index a07caed565..90116c3882 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -528,11 +528,13 @@ TermWindow::TermWinActivate() { Activate(); +#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST if (focus_follows_mouse()) { BPoint aMouseLoc = Frame().LeftTop(); set_mouse_position(int32(aMouseLoc.x + 16), int32(aMouseLoc.y + 2)); be_app->SetCursor(B_HAND_CURSOR); } +#endif } diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile index 589a0796f8..0f4c1d577a 100644 --- a/src/kits/tracker/Jamfile +++ b/src/kits/tracker/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src kits tracker ; +AddSubDirSupportedPlatforms libbe_test ; + UsePrivateHeaders shared ; UsePrivateHeaders tracker ; @@ -83,9 +85,10 @@ SharedLibrary libtracker.so : ViewState.cpp VolumeWindow.cpp WidgetAttributeText.cpp - : libbe.so libtranslation.so + : be libtranslation.so ; -if $(HAIKU_COMPATIBLE) { - LinkAgainst libtracker.so : libroot.so ; +if $(TARGET_PLATFORM) = libbe_test { + HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : libtracker.so + : tests!apps!lib ; } diff --git a/src/tests/apps/miniterminal/Jamfile b/src/tests/apps/miniterminal/Jamfile index 260c290f81..90d0a04834 100644 --- a/src/tests/apps/miniterminal/Jamfile +++ b/src/tests/apps/miniterminal/Jamfile @@ -1,7 +1,6 @@ SubDir HAIKU_TOP src tests apps miniterminal ; SetSubDirSupportedPlatformsBeOSCompatible ; -AddSubDirSupportedPlatforms libbe_test ; UseHeaders [ FDirName $(HAIKU_TOP) src tests apps miniterminal ] ; UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ; @@ -17,8 +16,3 @@ Application MiniTerminal : ViewBuffer.cpp : be ; - -if $(TARGET_PLATFORM) = libbe_test { - HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : MiniTerminal - : tests!apps ; -}