11 files changed, 10 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript
index 146591866c1..a24aceaea1b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -18,6 +18,11 @@ if env['hostonly']:
 # enable OpenGL ES support.
 SConscript('mapi/glapi/gen/SConscript')
 SConscript('mapi/glapi/SConscript')
+
+# Haiku C++ libGL dispatch (renderers depend on libgl)
+if env['platform'] in ['haiku']:
+    SConscript('hgl/SConscript')
+
 SConscript('mesa/SConscript')
 
 SConscript('mapi/vgapi/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 6e27be2c062..32bbdbe5686 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -119,7 +119,6 @@ if not env['embedded']:
     if env['platform'] == 'haiku':
         SConscript([
             'targets/haiku-softpipe/SConscript',
-            'targets/libgl-haiku/SConscript',
         ])
 
     if env['dri']:
diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
index 16ce7cd9e13..0381d0550eb 100644
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -17,6 +17,8 @@ if True:
     ])
     env.Prepend(LIBS = [softpipe])
 
+env.Prepend(LIBS = [libgl])
+
 env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/mesa',
diff --git a/src/gallium/targets/libgl-haiku/GLDispatcher.cpp b/src/hgl/GLDispatcher.cpp
index 46b91d57c49..46b91d57c49 100644
--- a/src/gallium/targets/libgl-haiku/GLDispatcher.cpp
+++ b/src/hgl/GLDispatcher.cpp
diff --git a/src/gallium/targets/libgl-haiku/GLDispatcher.h b/src/hgl/GLDispatcher.h
index 44bca8ce586..44bca8ce586 100644
--- a/src/gallium/targets/libgl-haiku/GLDispatcher.h
+++ b/src/hgl/GLDispatcher.h
diff --git a/src/gallium/targets/libgl-haiku/GLRenderer.cpp b/src/hgl/GLRenderer.cpp
index 4573a64a35c..4573a64a35c 100644
--- a/src/gallium/targets/libgl-haiku/GLRenderer.cpp
+++ b/src/hgl/GLRenderer.cpp
diff --git a/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp b/src/hgl/GLRendererRoster.cpp
index 1712a871c98..1712a871c98 100644
--- a/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp
+++ b/src/hgl/GLRendererRoster.cpp
diff --git a/src/gallium/targets/libgl-haiku/GLRendererRoster.h b/src/hgl/GLRendererRoster.h
index 5c8da271198..5c8da271198 100644
--- a/src/gallium/targets/libgl-haiku/GLRendererRoster.h
+++ b/src/hgl/GLRendererRoster.h
diff --git a/src/gallium/targets/libgl-haiku/GLView.cpp b/src/hgl/GLView.cpp
index 9ae5b5c83ac..9ae5b5c83ac 100644
--- a/src/gallium/targets/libgl-haiku/GLView.cpp
+++ b/src/hgl/GLView.cpp
diff --git a/src/gallium/targets/libgl-haiku/SConscript b/src/hgl/SConscript
index 43d15c50e32..70db1494df8 100644
--- a/src/gallium/targets/libgl-haiku/SConscript
+++ b/src/hgl/SConscript
@@ -33,3 +33,4 @@ libgl = env.SharedLibrary(
 )
 
 env.Alias('libgl-haiku', libgl)
+Export('libgl')
diff --git a/src/mesa/drivers/haiku/swrast/SConscript b/src/mesa/drivers/haiku/swrast/SConscript
index ca0423e4ad8..aef730098c1 100644
--- a/src/mesa/drivers/haiku/swrast/SConscript
+++ b/src/mesa/drivers/haiku/swrast/SConscript
@@ -16,6 +16,8 @@ env.Prepend(LIBS = [
     mesa,
 ])
 
+env.Prepend(LIBS = [libgl])
+
 sources = [
 	'SoftwareRast.cpp'
 ]