diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 20:12:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 20:12:35 +0200 |
| commit | 19b4b68b35a047a83bd291ee8debac1adb0e946c (patch) | |
| tree | d4d4520622ecf73fa0d076dc0bf517a1189b7d9f /mesalib/scons/gallium.py | |
| parent | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (diff) | |
| parent | 438af0c7d4bf60b408b259c88205ff2193195466 (diff) | |
| download | vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.gz vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.bz2 vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/macros.h
xorg-server/dix/registry.c
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/xwin/Makefile.am
xorg-server/hw/xwin/glx/.gitignore
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/windisplay.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winprefs.c
Diffstat (limited to 'mesalib/scons/gallium.py')
| -rw-r--r-- | mesalib/scons/gallium.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index e91531971..1dcfa6b24 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -529,6 +529,10 @@ def generate(env): else: env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group' if env['platform'] == 'windows': + linkflags += [ + '-Wl,--nxcompat', # DEP + '-Wl,--dynamicbase', # ASLR + ] # Avoid depending on gcc runtime DLLs linkflags += ['-static-libgcc'] if 'w64' in env['CC'].split('-'): @@ -547,6 +551,8 @@ def generate(env): linkflags += [ '/fixed:no', '/incremental:no', + '/dynamicbase', # ASLR + '/nxcompat', # DEP ] env.Append(LINKFLAGS = linkflags) env.Append(SHLINKFLAGS = shlinkflags) |