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:
@@ -225,14 +225,6 @@ def generate(env):
|
|||||||
# default in recent gcc versions
|
# default in recent gcc versions
|
||||||
env.AppendUnique(CCFLAGS = ['-gstabs'])
|
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')
|
env.AddMethod(compile_without_gstabs, 'compile_without_gstabs')
|
||||||
|
|
||||||
def exists(env):
|
def exists(env):
|
||||||
|
@@ -279,6 +279,8 @@ def generate(env):
|
|||||||
('_WIN32_WINNT', '0x0601'),
|
('_WIN32_WINNT', '0x0601'),
|
||||||
('WINVER', '0x0601'),
|
('WINVER', '0x0601'),
|
||||||
]
|
]
|
||||||
|
if gcc:
|
||||||
|
cppdefines += [('__MSVCRT_VERSION__', '0x0700')]
|
||||||
if msvc and env['toolchain'] != 'winddk':
|
if msvc and env['toolchain'] != 'winddk':
|
||||||
cppdefines += [
|
cppdefines += [
|
||||||
'VC_EXTRALEAN',
|
'VC_EXTRALEAN',
|
||||||
@@ -532,6 +534,12 @@ def generate(env):
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
|
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 msvc:
|
||||||
if env['build'] == 'release':
|
if env['build'] == 'release':
|
||||||
# enable Link-time Code Generation
|
# enable Link-time Code Generation
|
||||||
|
Reference in New Issue
Block a user