From a166264bf34ea5dc7a7d4c4d857fcc3e7d0af0bc Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 6 Oct 2014 17:32:22 +0200 Subject: [PATCH] test_app_server: use libstackandtile. We build a static lib for it, so we may as well use it. --- src/servers/app/stackandtile/Jamfile | 2 ++ src/tests/servers/app/Jamfile | 15 ++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/servers/app/stackandtile/Jamfile b/src/servers/app/stackandtile/Jamfile index be55eb7397..d1c2a6de8e 100644 --- a/src/servers/app/stackandtile/Jamfile +++ b/src/servers/app/stackandtile/Jamfile @@ -4,6 +4,8 @@ UseLibraryHeaders agg lp_solve linprog ; UsePrivateHeaders app graphics interface shared kernel ; UseBuildFeatureHeaders freetype ; +SetSubDirSupportedPlatforms libbe_test ; + UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ; diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile index af600870ac..f6427922e3 100644 --- a/src/tests/servers/app/Jamfile +++ b/src/tests/servers/app/Jamfile @@ -47,7 +47,6 @@ SEARCH_SOURCE += [ FDirName $(appServerDir) decorator ] ; SEARCH_SOURCE += [ FDirName $(appServerDir) drawing ] ; SEARCH_SOURCE += [ FDirName $(appServerDir) drawing Painter ] ; SEARCH_SOURCE += [ FDirName $(appServerDir) font ] ; -SEARCH_SOURCE += [ FDirName $(appServerDir) stackandtile ] ; SharedLibrary libhwinterface.so : BBitmapBuffer.cpp @@ -168,22 +167,16 @@ SharedLibrary libtestappserver.so : Workspace.cpp WorkspacesView.cpp - # stack and tile - SATDecorator.cpp - SATGroup.cpp - SATWindow.cpp - StackAndTile.cpp - Stacking.cpp - Tiling.cpp # libraries : be libpainter.a libagg.a liblinprog.a libtextencoding.so libshared.a + libstackandtile.a [ BuildFeatureAttribute freetype : library ] ; Includes [ FGristFiles AppServer.cpp BitmapManager.cpp ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp - DrawState.cpp DrawingContext.cpp DrawingEngine.cpp ServerApp.cpp - ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp + DrawState.cpp DrawingContext.cpp DrawingEngine.cpp ServerApp.cpp + ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp $(decorator_src) $(font_src) ] : [ BuildFeatureAttribute freetype : headers ] ; @@ -207,7 +200,7 @@ Server test_app_server : # install in the test dir HaikuInstall install-test-apps : $(HAIKU_APP_TEST_LIB_DIR) : libtestappserver.so libbe_test.so - libhwinterface.so libhwinterfaceimpl.so libtextencoding.so + libhwinterface.so libhwinterfaceimpl.so libtextencoding.so : tests!apps ; HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : test_app_server