diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:36:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:36:10 +0100 |
| commit | 06872e284da1c00ce03b234ca24aefeac64990d2 (patch) | |
| tree | e1e8bee8a20f7b759b50edfc21d2313489280d10 /mesalib/scons/custom.py | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.gz vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.bz2 vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.zip | |
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4
mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef
pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa
xkbcomp: 705b9bbb426410f9510601c7010da51184919b36
xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
Diffstat (limited to 'mesalib/scons/custom.py')
| -rw-r--r-- | mesalib/scons/custom.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py index 277c05b67..658df9782 100644 --- a/mesalib/scons/custom.py +++ b/mesalib/scons/custom.py @@ -240,6 +240,11 @@ def parse_source_list(env, filename, names=None): top_srcdir = env.Dir('#').abspath top_builddir = os.path.join(top_srcdir, env['build_dir']) + # Normalize everything to / slashes + cur_srcdir = cur_srcdir.replace('\\', '/') + top_srcdir = top_srcdir.replace('\\', '/') + top_builddir = top_builddir.replace('\\', '/') + # Populate the symbol table of the Makefile parser. parser.add_symbol('top_srcdir', top_srcdir) parser.add_symbol('top_builddir', top_builddir) @@ -263,8 +268,8 @@ def parse_source_list(env, filename, names=None): if f: # Process source paths if f.startswith(top_builddir + '/src'): - # Automake puts build output on a `src` subdirectory, bue - # SCons does no, so strip it here. + # Automake puts build output on a `src` subdirectory, but + # SCons does not, so strip it here. f = top_builddir + f[len(top_builddir + '/src'):] if f.startswith(cur_srcdir + '/'): # Prefer relative source paths, as absolute files tend to |