Author: axeld Date: 2011-09-30 02:00:56 +0200 (Fri, 30 Sep 2011) New Revision: 42788 Changeset: https://dev.haiku-os.org/changeset/42788 Modified: haiku/trunk/src/libs/linprog/Jamfile haiku/trunk/src/tests/servers/app/Jamfile Log: * 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? :-) Modified: haiku/trunk/src/libs/linprog/Jamfile =================================================================== --- haiku/trunk/src/libs/linprog/Jamfile 2011-09-29 23:58:34 UTC (rev 42787) +++ haiku/trunk/src/libs/linprog/Jamfile 2011-09-30 00:00:56 UTC (rev 42788) @@ -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 Modified: haiku/trunk/src/tests/servers/app/Jamfile =================================================================== --- haiku/trunk/src/tests/servers/app/Jamfile 2011-09-29 23:58:34 UTC (rev 42787) +++ haiku/trunk/src/tests/servers/app/Jamfile 2011-09-30 00:00:56 UTC (rev 42788) @@ -79,8 +79,8 @@ CursorManager.cpp CursorSet.cpp DesktopListener.cpp - DesktopSettings.cpp DirectWindowInfo.cpp + DrawingEngine.cpp DrawState.cpp FontCache.cpp FontCacheEntry.cpp @@ -101,35 +101,34 @@ 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 @@ 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 @@ 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++) ;