diff options
| author | Chia-I Wu <[email protected]> | 2011-01-09 23:37:32 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-01-12 17:40:01 +0800 |
| commit | a8b6b6555c7d6a02a3d095c72ebbdc218bc45cd3 (patch) | |
| tree | d0d21b537682efd23b3d107a639bb86eaf825782 /src/egl/main/SConscript | |
| parent | 49ed5bb28d501cd6751bd59dc25a60a4293bcd75 (diff) | |
scons: Updates for targets/egl-static.
Update SConscripts to re-enable or add support for EGL on windows and
x11 platforms respectively. targets/egl-gdi is replaced by
targets/egl-static, where "-static" means pipe drivers and state
trackers are linked to statically by egl_gallium, and egl_gallium is a
built-in driver of libEGL. There is no more egl_gallium.dll on Windows.
Diffstat (limited to 'src/egl/main/SConscript')
| -rw-r--r-- | src/egl/main/SConscript | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript index f001b81600f..8c57ceaf20f 100644 --- a/src/egl/main/SConscript +++ b/src/egl/main/SConscript @@ -7,13 +7,23 @@ Import('*') env = env.Clone() env.Append(CPPDEFINES = [ - '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_WINDOWS', + '_EGL_BUILT_IN_DRIVER_GALLIUM', '_EGL_DRIVER_SEARCH_DIR=\\"\\"', - '_EGL_OS_WINDOWS', - '_EGL_GET_CORE_ADDRESSES', - 'KHRONOS_DLL_EXPORTS', ]) +if env['platform'] == 'windows': + env.Append(CPPDEFINES = [ + '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_WINDOWS', + '_EGL_OS_WINDOWS', + '_EGL_GET_CORE_ADDRESSES', + 'KHRONOS_DLL_EXPORTS', + ]) +else: + env.Append(CPPDEFINES = [ + '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11', + '_EGL_OS_UNIX', + ]) + env.Append(CPPPATH = [ '#/include', ]) @@ -38,15 +48,9 @@ egl_sources = [ 'eglsync.c', ] -egl = env.SharedLibrary( - target = 'libEGL', - source = egl_sources + ['egl.def'], +egl = env.ConvenienceLibrary( + target = 'egl', + source = egl_sources, ) -installed_egl = env.InstallSharedLibrary(egl, version=(1, 4, 0)) - -env.Alias('egl', installed_egl) - -egl = [env.FindIxes(egl, 'LIBPREFIX', 'LIBSUFFIX')] - Export('egl') |