From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 11 Jun 2015 11:20:34 +0000 (+0100)
Subject: egl/haiku: we don't use src/loader, drop all the references to it
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=667fe2f5e9508a9591eeabdd7a01596006d87e5f;p=mesa.git

egl/haiku: we don't use src/loader, drop all the references to it

Cc: Alexander von Gluck IV <kallisti5@unixzen.com>
Acked-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/src/egl/drivers/haiku/SConscript b/src/egl/drivers/haiku/SConscript
index 9dd2f70f4ac..ec6020ece77 100644
--- a/src/egl/drivers/haiku/SConscript
+++ b/src/egl/drivers/haiku/SConscript
@@ -9,7 +9,6 @@ env.Append(CPPDEFINES = [
 env.Append(CPPPATH = [
 	'#/include',
 	'#/src/egl/main',
-	'#/src/loader',
 ])
 
 sources = [
@@ -22,10 +21,6 @@ if env['platform'] == 'haiku':
 		'_EGL_NATIVE_PLATFORM=haiku',
 	])
 
-env.Prepend(LIBS = [
-	libloader,
-])
-
 egl_haiku = env.ConvenienceLibrary(
 	target = 'egl_haiku',
 	source = sources,
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
index cfe8817fbac..056fafc729d 100644
--- a/src/egl/drivers/haiku/egl_haiku.cpp
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "loader.h"
 #include "eglconfig.h"
 #include "eglcontext.h"
 #include "egldisplay.h"
@@ -244,8 +243,6 @@ init_haiku(_EGLDriver *drv, _EGLDisplay *dpy)
 
 	_eglSetLogProc(haiku_log);
 
-	loader_set_logger(_eglLog);
-
 	TRACE("Add configs\n");
 	haiku_add_configs_for_visuals(dpy);