projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: Fix a typo in mesa3d.org HTML.
[mesa.git]
/
scons
/
crossmingw.py
diff --git
a/scons/crossmingw.py
b/scons/crossmingw.py
index cf4887ba464924dc2032407ba2720eda8ef4a12b..a4ae74e8d5454e3fc729ffea864791fd6c04821a 100644
(file)
--- a/
scons/crossmingw.py
+++ b/
scons/crossmingw.py
@@
-108,7
+108,7
@@
def shlib_emitter(target, source, env):
return (target, source)
return (target, source)
-shlib_action = SCons.Action.Action(shlib_generator, generator=1)
+shlib_action = SCons.Action.Action(shlib_generator,
'$SHLINKCOMSTR',
generator=1)
res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
@@
-162,21
+162,25
@@
def generate(env):
# Some setting from the platform also have to be overridden:
env['OBJPREFIX'] = ''
env['OBJSUFFIX'] = '.o'
# Some setting from the platform also have to be overridden:
env['OBJPREFIX'] = ''
env['OBJSUFFIX'] = '.o'
- env['LIBPREFIX'] = 'lib'
- env['LIBSUFFIX'] = '.a'
env['SHOBJPREFIX'] = '$OBJPREFIX'
env['SHOBJSUFFIX'] = '$OBJSUFFIX'
env['PROGPREFIX'] = ''
env['PROGSUFFIX'] = '.exe'
env['SHOBJPREFIX'] = '$OBJPREFIX'
env['SHOBJSUFFIX'] = '$OBJSUFFIX'
env['PROGPREFIX'] = ''
env['PROGSUFFIX'] = '.exe'
- env['LIBPREFIX'] = ''
- env['LIBSUFFIX'] = '.
lib
'
+ env['LIBPREFIX'] = '
lib
'
+ env['LIBSUFFIX'] = '.
a
'
env['SHLIBPREFIX'] = ''
env['SHLIBSUFFIX'] = '.dll'
env['SHLIBPREFIX'] = ''
env['SHLIBSUFFIX'] = '.dll'
- env['LIBPREFIXES'] = [ '$LIBPREFIX' ]
- env['LIBSUFFIXES'] = [ '$LIBSUFFIX' ]
+ env['LIBPREFIXES'] = [ 'lib', '' ]
+ env['LIBSUFFIXES'] = [ '.a', '.lib' ]
+
+ # MinGW port of gdb does not handle well dwarf debug info which is the
+ # default in recent gcc versions
+ env.AppendUnique(CFLAGS = ['-gstabs'])
- env.AppendUnique(LIBS = ['iberty'])
- env.AppendUnique(LINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
+ env.AppendUnique(CPPDEFINES = [('__MSVCRT_VERSION__', '0x0700')])
+ #env.AppendUnique(LIBS = ['iberty'])
+ env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
+ #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at'])
def exists(env):
return find(env)
def exists(env):
return find(env)