From b176b6b4936be2f53eb29bc63c5f6ff2be44d153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Tue, 12 Apr 2005 08:22:16 +0000
Subject: [PATCH] The DisplayDriverPainter is now also the default on Haiku.
 The DisplayDriverImpl stuff is left out for now.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12340 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/Desktop.cpp | 10 +++++-----
 src/servers/app/Jamfile     | 27 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index c4613e1121..6c71a20646 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -42,8 +42,8 @@
 #include "Workspace.h"
 
 #if DISPLAYDRIVER == HWDRIVER
-	#include "AccelerantDriver.h"
-//	#include "DisplayDriverPainter.h"
+//	#include "AccelerantDriver.h"
+	#include "DisplayDriverPainter.h"
 #elif DISPLAYDRIVER == DIRECTDRIVER
 	#include "DirectDriver.h"
 #elif DISPLAYDRIVER == PAINTERDRIVER
@@ -94,8 +94,8 @@ Desktop::Init(void)
 	
 	bool initDrivers = true;
 	while (initDrivers) {
-		driver = new AccelerantDriver();
-//		driver = new DisplayDriverPainter();
+//		driver = new AccelerantDriver();
+		driver = new DisplayDriverPainter();
 		AddDriver(driver);
 		initDrivers = false;
 	}
@@ -133,11 +133,11 @@ Desktop::AddDriver(DisplayDriver *driver)
 	if (driver->Initialize()) {
 		// TODO: be careful of screen initialization - monitor may not support 640x480
 		Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB32, fScreenList.CountItems()+1);
-//		Screen *sc = new Screen(driver, BPoint(1024, 768), B_RGB32, fScreenList.CountItems()+1);
 //		Screen *sc = new Screen(driver, BPoint(640, 480), B_CMAP8, fScreenList.CountItems()+1);
 //		Screen *sc = new Screen(driver, BPoint(640, 480), B_GRAY8, fScreenList.CountItems()+1);
 //		Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB15, fScreenList.CountItems()+1);
 //		Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB16, fScreenList.CountItems()+1);
+//		Screen *sc = new Screen(driver, BPoint(1024, 768), B_RGB32, fScreenList.CountItems()+1);
 		fScreenList.AddItem(sc);
 	} else {
 		driver->Shutdown();
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 40b78867d2..d71c875d08 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -22,20 +22,21 @@ if ( $(TARGET_PLATFORM) = haiku ) {
 	SubDirC++Flags $(defines) ;
 	
 	VIEW_DRIVER_SOURCES =
-#		AccelerantBuffer.cpp
-		AccelerantDriver.cpp
-#		AccelerantHWInterface.cpp
-#		DisplayDriverPainter.cpp
-#		HWInterface.cpp
-#		UpdateQueue.cpp
+		AccelerantBuffer.cpp
+#		AccelerantDriver.cpp
+		AccelerantHWInterface.cpp
+		DisplayDriverPainter.cpp
+		HWInterface.cpp
+		MallocBuffer.cpp
+		UpdateQueue.cpp
 		;
 } else {
 	VIEW_DRIVER_SOURCES =
 		fake_input_server.cpp
-		AccelerantDriver.cpp
-		BitmapDriver.cpp
-		ViewDriver.cpp
-		DirectDriver.cpp
+#		AccelerantDriver.cpp
+#		BitmapDriver.cpp
+#		ViewDriver.cpp
+#		DirectDriver.cpp
 		# We'll just remove this from the build for a little while...
 		#ScreenDriver.cpp
 		# Painter based DisplayDriver Classes
@@ -77,7 +78,7 @@ SharedLibrary appserver :
 	PatternHandler.cpp
 	PixelRenderer.cpp
 	DisplayDriver.cpp
-	DisplayDriverImpl.cpp
+	#DisplayDriverImpl.cpp
 	DisplaySupport.cpp
 ;
 
@@ -118,8 +119,8 @@ if $(TARGET_PLATFORM) = haiku {
 
 	LinkSharedOSLibs app_server :
 		libroot.so libtranslation.so libz.so libpng.so libbe.so
-		libappserver.so libfreetype.so libtextencoding.so ;
-#		libagg.a libpainter.a ;
+		libappserver.so libpainter.a libagg.a libfreetype.so
+		libtextencoding.so ;
 
 } else {
 	# link as test application under R5