* 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:
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src apps terminal ;
|
SubDir HAIKU_TOP src apps terminal ;
|
||||||
|
|
||||||
|
AddSubDirSupportedPlatforms libbe_test ;
|
||||||
|
|
||||||
Application Terminal :
|
Application Terminal :
|
||||||
AppearPrefView.cpp
|
AppearPrefView.cpp
|
||||||
CodeConv.cpp
|
CodeConv.cpp
|
||||||
@@ -20,12 +22,16 @@ Application Terminal :
|
|||||||
UTF8WidthTbl.c
|
UTF8WidthTbl.c
|
||||||
VTKeyTbl.c
|
VTKeyTbl.c
|
||||||
VTPrsTbl.c
|
VTPrsTbl.c
|
||||||
: libbe.so libtracker.so libtextencoding.so libgame.so
|
: be libtracker.so libtextencoding.so
|
||||||
: Terminal.rdef Terminal.icons.rdef Terminal.version.rdef
|
: Terminal.rdef Terminal.icons.rdef Terminal.version.rdef
|
||||||
;
|
;
|
||||||
|
|
||||||
if $(TARGET_PLATFORM) = haiku {
|
if $(TARGET_PLATFORM) = haiku {
|
||||||
# link for Haiku
|
# link for Haiku
|
||||||
|
LinkAgainst Terminal : libgame.so ;
|
||||||
LinkAgainst Terminal : libroot.so ;
|
}
|
||||||
|
|
||||||
|
if $(TARGET_PLATFORM) = libbe_test {
|
||||||
|
HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Terminal
|
||||||
|
: tests!apps ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -528,11 +528,13 @@ TermWindow::TermWinActivate()
|
|||||||
{
|
{
|
||||||
Activate();
|
Activate();
|
||||||
|
|
||||||
|
#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
|
||||||
if (focus_follows_mouse()) {
|
if (focus_follows_mouse()) {
|
||||||
BPoint aMouseLoc = Frame().LeftTop();
|
BPoint aMouseLoc = Frame().LeftTop();
|
||||||
set_mouse_position(int32(aMouseLoc.x + 16), int32(aMouseLoc.y + 2));
|
set_mouse_position(int32(aMouseLoc.x + 16), int32(aMouseLoc.y + 2));
|
||||||
be_app->SetCursor(B_HAND_CURSOR);
|
be_app->SetCursor(B_HAND_CURSOR);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src kits tracker ;
|
SubDir HAIKU_TOP src kits tracker ;
|
||||||
|
|
||||||
|
AddSubDirSupportedPlatforms libbe_test ;
|
||||||
|
|
||||||
UsePrivateHeaders shared ;
|
UsePrivateHeaders shared ;
|
||||||
UsePrivateHeaders tracker ;
|
UsePrivateHeaders tracker ;
|
||||||
|
|
||||||
@@ -83,9 +85,10 @@ SharedLibrary libtracker.so :
|
|||||||
ViewState.cpp
|
ViewState.cpp
|
||||||
VolumeWindow.cpp
|
VolumeWindow.cpp
|
||||||
WidgetAttributeText.cpp
|
WidgetAttributeText.cpp
|
||||||
: libbe.so libtranslation.so
|
: be libtranslation.so
|
||||||
;
|
;
|
||||||
|
|
||||||
if $(HAIKU_COMPATIBLE) {
|
if $(TARGET_PLATFORM) = libbe_test {
|
||||||
LinkAgainst libtracker.so : libroot.so ;
|
HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : libtracker.so
|
||||||
|
: tests!apps!lib ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
SubDir HAIKU_TOP src tests apps miniterminal ;
|
SubDir HAIKU_TOP src tests apps miniterminal ;
|
||||||
|
|
||||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
AddSubDirSupportedPlatforms libbe_test ;
|
|
||||||
|
|
||||||
UseHeaders [ FDirName $(HAIKU_TOP) src tests apps miniterminal ] ;
|
UseHeaders [ FDirName $(HAIKU_TOP) src tests apps miniterminal ] ;
|
||||||
UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ;
|
UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ;
|
||||||
@@ -17,8 +16,3 @@ Application MiniTerminal :
|
|||||||
ViewBuffer.cpp
|
ViewBuffer.cpp
|
||||||
: be
|
: be
|
||||||
;
|
;
|
||||||
|
|
||||||
if $(TARGET_PLATFORM) = libbe_test {
|
|
||||||
HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : MiniTerminal
|
|
||||||
: tests!apps ;
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user