From 8b794301de0d6dcbbe1d1734e611fae170e5be81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 13 Nov 2005 15:40:21 +0000 Subject: [PATCH] Changed the way the app_server is built: * no more libappserver.so - this breaks the "Appearance" application, but that has to be fixed some day later. * the drawing stuff is now built in its own directory as libasdrawing.a. * TEST_MODE defaults to "0" if not defined yet - it's overridden in the test build now, not in the main build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14896 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/servers/app/ServerConfig.h | 2 +- src/servers/app/Jamfile | 96 +++++++--------------- src/servers/app/drawing/Jamfile | 32 ++++++++ src/tests/servers/app/Jamfile | 6 ++ 4 files changed, 68 insertions(+), 68 deletions(-) create mode 100644 src/servers/app/drawing/Jamfile diff --git a/headers/private/servers/app/ServerConfig.h b/headers/private/servers/app/ServerConfig.h index 324bbe2521..99da638dbe 100644 --- a/headers/private/servers/app/ServerConfig.h +++ b/headers/private/servers/app/ServerConfig.h @@ -5,7 +5,7 @@ // system keyboard shortcuts. Note that it is possible, though senseless, to place it in // regular mode and still use a display driver which depends on the R5 app_server #ifndef TEST_MODE - #define TEST_MODE 1 + #define TEST_MODE 0 #endif // Uncomment this if the DisplayDriver should only rely on drawing functions implemented diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile index 36804898f0..61d3308e2d 100644 --- a/src/servers/app/Jamfile +++ b/src/servers/app/Jamfile @@ -2,102 +2,64 @@ SubDir HAIKU_TOP src servers app ; AddResources app_server : app_server.rdef ; -UseLibraryHeaders agg png zlib ; +UseLibraryHeaders png zlib ; UsePrivateHeaders app interface shared [ FDirName servers app ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ; UseFreeTypeHeaders ; -SEARCH_SOURCE += [ FDirName $(SUBDIR) drawing ] ; -# This overrides the definitions in private/servers/app/ServerConfig.h -local defines = [ FDefines TEST_MODE=0 ] ; - -SubDirCcFlags $(defines) ; -SubDirC++Flags $(defines) ; - - -SharedLibrary libappserver.so : +Server app_server : Angle.cpp + AppServer.cpp BGet++.cpp BitmapManager.cpp ColorSet.cpp CursorData.cpp + CursorManager.cpp CursorSet.cpp + DebugInfoManager.cpp + DecorManager.cpp + Decorator.cpp + DefaultDecorator.cpp + Desktop.cpp + DesktopSettings.cpp DrawState.cpp FontFamily.cpp + FontManager.cpp HashTable.cpp + Layer.cpp + MessageLooper.cpp + MultiLocker.cpp + OffscreenServerWindow.cpp + OffscreenWinBorder.cpp + PNGDump.cpp + PicturePlayer.cpp + RAMLinkMsgReader.cpp RGBColor.cpp + RootLayer.cpp + ScreenManager.cpp + ServerApp.cpp ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp - FontManager.cpp + ServerPicture.cpp + ServerScreen.cpp + ServerWindow.cpp + SubWindowList.cpp SystemPalette.cpp TokenHandler.cpp Utils.cpp - - # drawing - PatternHandler.cpp - - # libraries - : libroot.so libbe.so libfreetype.so libtextencoding.so -; - -Server app_server : - # Misc. Sources - Decorator.cpp - DebugInfoManager.cpp - SubWindowList.cpp - PicturePlayer.cpp - PNGDump.cpp - RAMLinkMsgReader.cpp - MessageLooper.cpp - - # Manager Classes - CursorManager.cpp - DecorManager.cpp - ScreenManager.cpp - - AppServer.cpp - Desktop.cpp - DesktopSettings.cpp - - ServerApp.cpp - ServerWindow.cpp - - # DrawingEngine Classes - AccelerantBuffer.cpp - AccelerantHWInterface.cpp - BitmapBuffer.cpp - DrawingEngine.cpp - MallocBuffer.cpp - UpdateQueue.cpp - - BBitmapBuffer.cpp - HWInterface.cpp - MultiLocker.cpp - VirtualScreen.cpp - BitmapHWInterface.cpp - DefaultDecorator.cpp - Layer.cpp - OffscreenServerWindow.cpp - OffscreenWinBorder.cpp - RootLayer.cpp - ServerPicture.cpp - ServerScreen.cpp WinBorder.cpp Workspace.cpp WorkspacesLayer.cpp # libraries : - libroot.so libtranslation.so libz.so libpng.so libbe.so - libappserver.so libpainter.a libagg.a libfreetype.so + libtranslation.so libz.so libpng.so libbe.so + libasdrawing.a libpainter.a libagg.a libfreetype.so libtextencoding.so ; -SubInclude HAIKU_TOP src servers app drawing Painter ; +SubInclude HAIKU_TOP src servers app drawing ; diff --git a/src/servers/app/drawing/Jamfile b/src/servers/app/drawing/Jamfile new file mode 100644 index 0000000000..c29613d183 --- /dev/null +++ b/src/servers/app/drawing/Jamfile @@ -0,0 +1,32 @@ +SubDir HAIKU_TOP src servers app drawing ; + +UseLibraryHeaders agg ; +UsePrivateHeaders app interface shared [ FDirName servers app ] ; + +UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ; +UseFreeTypeHeaders ; + +StaticLibrary libasdrawing.a : + AccelerantBuffer.cpp + AccelerantHWInterface.cpp + BitmapBuffer.cpp + DrawingEngine.cpp + MallocBuffer.cpp + UpdateQueue.cpp + PatternHandler.cpp + + BitmapHWInterface.cpp + BBitmapBuffer.cpp + HWInterface.cpp + + # libraries + : + libtranslation.so libz.so libpng.so libbe.so + libpainter.a libagg.a libfreetype.so + libtextencoding.so +; + +SubInclude HAIKU_TOP src servers app drawing Painter ; diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile index 5f25a1f67c..b2884e51c5 100644 --- a/src/tests/servers/app/Jamfile +++ b/src/tests/servers/app/Jamfile @@ -16,6 +16,12 @@ UseHeaders [ FDirName $(appServerDir) drawing Painter drawing_modes ] ; UseHeaders [ FDirName $(appServerDir) drawing Painter font_support ] ; UseFreeTypeHeaders ; +# This overrides the definitions in private/servers/app/ServerConfig.h +local defines = [ FDefines TEST_MODE=1 ] ; + +SubDirCcFlags $(defines) ; +SubDirC++Flags $(defines) ; + SEARCH_SOURCE += $(appServerDir) [ FDirName $(appServerDir) drawing ] ; SharedLibrary libhwinterface.so :