* 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
This commit is contained in:
Axel Dörfler
2005-11-11 13:50:26 +00:00
parent 71922d1950
commit ba98d1b0cd
4 changed files with 18 additions and 13 deletions
+10 -4
View File
@@ -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 ;
}
+2
View File
@@ -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
}
+6 -3
View File
@@ -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 ;
}
-6
View File
@@ -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 ;
}