scons: Move MinGW flags from crossmingw.py to gallium.py

So that they are used by native MinGW compilers too.
This commit is contained in:
José Fonseca
2011-09-06 13:13:32 +01:00
parent 1d52ddc3bb
commit 0646246cae
2 changed files with 8 additions and 8 deletions

View File

@@ -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):

View File

@@ -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,12 @@ 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']
# 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