aboutsummaryrefslogtreecommitdiff
path: root/mesalib/scons
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/scons')
-rw-r--r--mesalib/scons/custom.py9
-rw-r--r--mesalib/scons/gallium.py2
2 files changed, 8 insertions, 3 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
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 7207c6bb2..a8b1f0301 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -399,7 +399,6 @@ def generate(env):
ccflags += [
'/Od', # disable optimizations
'/Oi', # enable intrinsic functions
- '/Oy-', # disable frame pointer omission
]
else:
ccflags += [
@@ -411,6 +410,7 @@ def generate(env):
]
else:
ccflags += [
+ '/Oy-', # disable frame pointer omission
'/GL-', # disable whole program optimization
]
ccflags += [