test_app_server: use libstackandtile.

We build a static lib for it, so we may as well use it.
This commit is contained in:
Adrien Destugues
2014-10-06 17:32:53 +02:00
parent 7554bc9a19
commit a166264bf3
2 changed files with 6 additions and 11 deletions
+2
View File
@@ -4,6 +4,8 @@ UseLibraryHeaders agg lp_solve linprog ;
UsePrivateHeaders app graphics interface shared kernel ; UsePrivateHeaders app graphics interface shared kernel ;
UseBuildFeatureHeaders freetype ; UseBuildFeatureHeaders freetype ;
SetSubDirSupportedPlatforms libbe_test ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
+4 -11
View File
@@ -47,7 +47,6 @@ SEARCH_SOURCE += [ FDirName $(appServerDir) decorator ] ;
SEARCH_SOURCE += [ FDirName $(appServerDir) drawing ] ; SEARCH_SOURCE += [ FDirName $(appServerDir) drawing ] ;
SEARCH_SOURCE += [ FDirName $(appServerDir) drawing Painter ] ; SEARCH_SOURCE += [ FDirName $(appServerDir) drawing Painter ] ;
SEARCH_SOURCE += [ FDirName $(appServerDir) font ] ; SEARCH_SOURCE += [ FDirName $(appServerDir) font ] ;
SEARCH_SOURCE += [ FDirName $(appServerDir) stackandtile ] ;
SharedLibrary libhwinterface.so : SharedLibrary libhwinterface.so :
BBitmapBuffer.cpp BBitmapBuffer.cpp
@@ -168,22 +167,16 @@ SharedLibrary libtestappserver.so :
Workspace.cpp Workspace.cpp
WorkspacesView.cpp WorkspacesView.cpp
# stack and tile
SATDecorator.cpp
SATGroup.cpp
SATWindow.cpp
StackAndTile.cpp
Stacking.cpp
Tiling.cpp
# libraries # libraries
: be libpainter.a libagg.a liblinprog.a libtextencoding.so libshared.a : be libpainter.a libagg.a liblinprog.a libtextencoding.so libshared.a
libstackandtile.a
[ BuildFeatureAttribute freetype : library ] [ BuildFeatureAttribute freetype : library ]
; ;
Includes [ FGristFiles AppServer.cpp BitmapManager.cpp Includes [ FGristFiles AppServer.cpp BitmapManager.cpp
ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp
DrawState.cpp DrawingContext.cpp DrawingEngine.cpp ServerApp.cpp DrawState.cpp DrawingContext.cpp DrawingEngine.cpp ServerApp.cpp
ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp
ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp
$(decorator_src) $(font_src) ] $(decorator_src) $(font_src) ]
: [ BuildFeatureAttribute freetype : headers ] ; : [ BuildFeatureAttribute freetype : headers ] ;
@@ -207,7 +200,7 @@ Server test_app_server :
# install in the test dir # install in the test dir
HaikuInstall install-test-apps : $(HAIKU_APP_TEST_LIB_DIR) HaikuInstall install-test-apps : $(HAIKU_APP_TEST_LIB_DIR)
: libtestappserver.so libbe_test.so : libtestappserver.so libbe_test.so
libhwinterface.so libhwinterfaceimpl.so libtextencoding.so libhwinterface.so libhwinterfaceimpl.so libtextencoding.so
: tests!apps ; : tests!apps ;
HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : test_app_server HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : test_app_server