diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-08 11:05:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-08 11:05:14 +0200 |
| commit | 32071a97fb69e2cb5a5dc86016b181a5afd2a87b (patch) | |
| tree | 23a05e63a91e56c1c97a3c7b991e3acf46893e2f /mesalib/scons | |
| parent | 553aee48675d816bf041a61ab01bb73f8602d365 (diff) | |
| parent | 23a7aebae0a742d94ffe2304357dcc1234a99155 (diff) | |
| download | vcxsrv-32071a97fb69e2cb5a5dc86016b181a5afd2a87b.tar.gz vcxsrv-32071a97fb69e2cb5a5dc86016b181a5afd2a87b.tar.bz2 vcxsrv-32071a97fb69e2cb5a5dc86016b181a5afd2a87b.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/relnotes.html
mesalib/scons/gallium.py
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/main/colortab.c
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/enable.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/get.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/pack.c
mesalib/src/mesa/main/texgetimage.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/main/texparam.c
mesalib/src/mesa/main/texstate.c
mesalib/src/mesa/swrast/s_drawpix.c
mesalib/src/mesa/vbo/vbo_attrib_tmp.h
Diffstat (limited to 'mesalib/scons')
| -rw-r--r-- | mesalib/scons/crossmingw.py | 8 | ||||
| -rw-r--r-- | mesalib/scons/gallium.py | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/mesalib/scons/crossmingw.py b/mesalib/scons/crossmingw.py index 949fc4fb1..893002f64 100644 --- a/mesalib/scons/crossmingw.py +++ b/mesalib/scons/crossmingw.py @@ -225,14 +225,6 @@ def generate(env): # default in recent gcc versions env.AppendUnique(CCFLAGS = ['-gstabs']) - env.AppendUnique(CPPDEFINES = [('__MSVCRT_VERSION__', '0x0700')]) - #env.AppendUnique(LIBS = ['iberty']) - env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup']) - #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at']) - - # Avoid depending on gcc runtime DLLs - env.AppendUnique(LINKFLAGS = ['-static-libgcc']) - env.AddMethod(compile_without_gstabs, 'compile_without_gstabs') def exists(env): diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index 091c74078..99481a410 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -279,6 +279,8 @@ def generate(env): ('_WIN32_WINNT', '0x0601'),
('WINVER', '0x0601'),
]
+ if gcc:
+ cppdefines += [('__MSVCRT_VERSION__', '0x0700')]
if msvc and env['toolchain'] != 'winddk':
cppdefines += [
'VC_EXTRALEAN',
@@ -532,6 +534,14 @@ def generate(env): pass
else:
env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
+ if env['platform'] == 'windows':
+ # Avoid depending on gcc runtime DLLs
+ linkflags += ['-static-libgcc']
+ if env['machine'] == 'x86_64':
+ linkflags += ['-static-libstdc++']
+ # Handle the @xx symbol munging of DLL exports
+ shlinkflags += ['-Wl,--enable-stdcall-fixup']
+ #shlinkflags += ['-Wl,--kill-at']
if msvc:
if env['build'] == 'release':
# enable Link-time Code Generation
|