diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-08 10:54:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-08 10:54:11 +0200 |
| commit | 23a7aebae0a742d94ffe2304357dcc1234a99155 (patch) | |
| tree | 08dbd7956bbd1c5717967a4f904f8383139bbe1e /mesalib/scons | |
| parent | 53da0b7e7c183ea15692234332b3e337b3fb0cc0 (diff) | |
| download | vcxsrv-23a7aebae0a742d94ffe2304357dcc1234a99155.tar.gz vcxsrv-23a7aebae0a742d94ffe2304357dcc1234a99155.tar.bz2 vcxsrv-23a7aebae0a742d94ffe2304357dcc1234a99155.zip | |
mesa git update 8 sep 2011
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 7135251d7..dc77904f0 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 |