mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 04:20:08 +01:00
egl: Fix non-dri SCons builds re #87657
* Revert change to egl main producing Shared Libraries * Check for dri before including dri code
This commit is contained in:
parent
b3057f8097
commit
890ef622d6
2 changed files with 9 additions and 11 deletions
|
|
@ -33,7 +33,8 @@ if not env['embedded']:
|
|||
if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
|
||||
SConscript('glx/SConscript')
|
||||
if env['platform'] not in ['darwin', 'haiku', 'sunos']:
|
||||
SConscript('egl/drivers/dri2/SConscript')
|
||||
if env['dri']:
|
||||
SConscript('egl/drivers/dri2/SConscript')
|
||||
SConscript('egl/main/SConscript')
|
||||
if env['platform'] == 'haiku':
|
||||
SConscript('egl/drivers/haiku/SConscript')
|
||||
|
|
|
|||
|
|
@ -33,10 +33,11 @@ else:
|
|||
'_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11',
|
||||
'_EGL_OS_UNIX',
|
||||
])
|
||||
env.Prepend(LIBS = [
|
||||
egl_dri2,
|
||||
libloader,
|
||||
])
|
||||
if env['dri']:
|
||||
env.Prepend(LIBS = [
|
||||
egl_dri2,
|
||||
libloader,
|
||||
])
|
||||
|
||||
env.Append(CPPPATH = [
|
||||
'#/include',
|
||||
|
|
@ -46,12 +47,8 @@ env.Append(CPPPATH = [
|
|||
# parse Makefile.sources
|
||||
egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES')
|
||||
|
||||
# libEGL.dll
|
||||
env['LIBPREFIX'] = 'lib'
|
||||
env['SHLIBPREFIX'] = 'lib'
|
||||
|
||||
egl = env.SharedLibrary(
|
||||
target = 'EGL',
|
||||
egl = env.ConvenienceLibrary(
|
||||
target = 'egl',
|
||||
source = egl_sources,
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue