haiku libGL: Move from gallium target to src/hgl

* The Haiku renderers need to link to libGL to function properly
  in all usage contexts. As mesa drivers build before gallium
  targets, we couldn't properly link the mesa swrast driver to
  the gallium libGL target for Haiku.
* This is likely better as it mimics how glx is laid out ensuring
  the Haiku libGL is better understood.
* All renderers properly link in libGL now.
Acked-by: Brian Paul's avatarBrian Paul <brianp@vmware.com>
parent b236314a
......@@ -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')
......
......@@ -119,7 +119,6 @@ if not env['embedded']:
if env['platform'] == 'haiku':
SConscript([
'targets/haiku-softpipe/SConscript',
'targets/libgl-haiku/SConscript',
])
if env['dri']:
......
......@@ -17,6 +17,8 @@ if True:
])
env.Prepend(LIBS = [softpipe])
env.Prepend(LIBS = [libgl])
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
......
......@@ -33,3 +33,4 @@ libgl = env.SharedLibrary(
)
env.Alias('libgl-haiku', libgl)
Export('libgl')
......@@ -16,6 +16,8 @@ env.Prepend(LIBS = [
mesa,
])
env.Prepend(LIBS = [libgl])
sources = [
'SoftwareRast.cpp'
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment