Mercurial > mxe-octave

annotate src/mingw-osmesa-1-fixes.patch @ 3790:a169ad26bac2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use scons to build osmesa on windows systems
author John W. Eaton <jwe@octave.org>
date Sun, 15 Feb 2015 13:33:36 -0500
parents
children 4f586cfb8438
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3790
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/scons/gallium.py b/scons/gallium.py
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/scons/gallium.py 2014-06-25 00:33:39.000000000 -0400
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/scons/gallium.py 2015-02-15 12:07:49.271713764 -0500
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -529,10 +529,6 @@
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 else:
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 if env['platform'] == 'windows':
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - # Avoid depending on gcc runtime DLLs
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 - linkflags += ['-static-libgcc']
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 - if 'w64' in env['CC'].split('-'):
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 - linkflags += ['-static-libstdc++']
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 # Handle the @xx symbol munging of DLL exports
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 shlinkflags += ['-Wl,--enable-stdcall-fixup']
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 #shlinkflags += ['-Wl,--kill-at']