From f74afb8218127ea96c3a7a89e846b4ff12777635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 30 Sep 2011 00:00:56 +0000 Subject: [PATCH] * This makes our app_server test_environment work again under Haiku. * A small quiz for our build system gurus: if I just add libbe_test to liblinprog.a, I can't build the normal app_server anymore (only in the test environment). Why is that? And who's going to fix it? :-) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42788 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/libs/linprog/Jamfile | 4 ++-- src/tests/servers/app/Jamfile | 40 ++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/libs/linprog/Jamfile b/src/libs/linprog/Jamfile index d6e60024f8..33b8124c14 100644 --- a/src/libs/linprog/Jamfile +++ b/src/libs/linprog/Jamfile @@ -1,12 +1,12 @@ SubDir HAIKU_TOP src libs linprog ; -SetSubDirSupportedPlatformsBeOSCompatible ; +SetSubDirSupportedPlatforms haiku haiku_host libbe_test ; UseLibraryHeaders lp_solve linprog ; UsePrivateHeaders shared ; -StaticLibrary liblinprog.a : +StaticLibrary liblinprog.a : ActiveSetSolver.cpp Constraint.cpp LayoutOptimizer.cpp diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile index 596a0c0f65..ce08d755e6 100644 --- a/src/tests/servers/app/Jamfile +++ b/src/tests/servers/app/Jamfile @@ -79,8 +79,8 @@ SharedLibrary libtestappserver.so : CursorManager.cpp CursorSet.cpp DesktopListener.cpp - DesktopSettings.cpp DirectWindowInfo.cpp + DrawingEngine.cpp DrawState.cpp FontCache.cpp FontCacheEntry.cpp @@ -101,35 +101,34 @@ SharedLibrary libtestappserver.so : SystemPalette.cpp # drawing + drawing_support.cpp PatternHandler.cpp - # stack and tile - SATDecorator.cpp - SATGroup.cpp - SATWindow.cpp - StackAndTile.cpp - Stacking.cpp - Tiling.cpp - # trace.c # libraries - : be libpainter.a libtextencoding.so libfreetype.so libshared.a + : be libpainter.a libagg.a libtextencoding.so libfreetype.so libshared.a ; AddResources test_app_server : app_server.rdef ; Server test_app_server : # Misc. Sources - Decorator.cpp ProfileMessageSupport.cpp EventDispatcher.cpp EventStream.cpp MessageLooper.cpp + # Decorator + Decorator.cpp + DecorManager.cpp + DefaultDecorator.cpp + DefaultWindowBehaviour.cpp + MagneticBorder.cpp + WindowBehaviour.cpp + # Manager Classes BitmapManager.cpp - DecorManager.cpp InputManager.cpp ScreenManager.cpp @@ -145,12 +144,11 @@ Server test_app_server : BitmapBuffer.cpp BitmapDrawingEngine.cpp drawing_support.cpp - DrawingEngine.cpp MallocBuffer.cpp + DesktopSettings.cpp VirtualScreen.cpp BitmapHWInterface.cpp - DefaultDecorator.cpp OffscreenServerWindow.cpp OffscreenWindow.cpp RegionPool.cpp @@ -163,11 +161,19 @@ Server test_app_server : Workspace.cpp WorkspacesView.cpp + # stack and tile + SATDecorator.cpp + SATGroup.cpp + SATWindow.cpp + StackAndTile.cpp + Stacking.cpp + Tiling.cpp + # libraries : - z libtestappserver.so libpainter.a be - libhwinterface.so libhwinterfaceimpl.so - libagg.a libfreetype.so libtextencoding.so + z libtestappserver.so be + libhwinterface.so libhwinterfaceimpl.so liblinprog.a + libfreetype.so libtextencoding.so $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) ;