From b2a544442726e0e8c9c35d435f1a8e5b1ebe517b Mon Sep 17 00:00:00 2001 From: Adi Oanca Date: Mon, 8 Sep 2003 22:20:29 +0000 Subject: [PATCH] Moved FontServer.cpp into libappserver.so to avoid a linker error caused by modifications made in LayerData.h ... the line with: fontserver->GetSystemPlain(). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4583 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/server/Jamfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/servers/app/server/Jamfile b/src/servers/app/server/Jamfile index 7823613470..8fc0cd0f59 100644 --- a/src/servers/app/server/Jamfile +++ b/src/servers/app/server/Jamfile @@ -1,3 +1,4 @@ +SubInclude OBOS_TOP src servers app server fonts ; SubDir OBOS_TOP src servers app server ; Depends app_server : install_fonts ; @@ -22,6 +23,7 @@ SharedLibrary appserver : ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp + FontServer.cpp SysCursor.cpp SystemPalette.cpp TokenHandler.cpp @@ -49,18 +51,17 @@ Server app_server : ServerWindow.cpp # Font Classes - FontServer.cpp # Display Classes AccelerantDriver.cpp + ScreenDriver.cpp + ViewDriver.cpp DefaultDecorator.cpp DesktopClasses.cpp Layer.cpp RootLayer.cpp - ScreenDriver.cpp - ServerPicture.cpp - ViewDriver.cpp WinBorder.cpp + ServerPicture.cpp ; LINKFLAGS on app_server ?= $(LINKFLAGS) ; @@ -70,4 +71,3 @@ LinkSharedOSLibs app_server : root game translation libz.so libpng.so libappserv libopenbeos.so libfreetype.so ; -SubInclude OBOS_TOP src servers app server fonts ;