Fix OS-Mesa discovery in debug mode.

This commit is contained in:
Simon Sapin 2016-09-29 09:15:01 +02:00
parent ccfc60161b
commit 2108fa026e

View file

@ -434,7 +434,7 @@ class MachCommands(CommandBase):
# add it to the dynamic linker search path.
if sys.platform.startswith('linux'):
try:
args = [self.get_binary_path(True, False)]
args = [self.get_binary_path(kwargs["release"], not kwargs["release"])]
osmesa_path = path.join(find_dep_path_newest('osmesa-src', args[0]), "out", "lib", "gallium")
os.environ["LD_LIBRARY_PATH"] = osmesa_path
os.environ["GALLIUM_DRIVER"] = "softpipe"
@ -444,7 +444,7 @@ class MachCommands(CommandBase):
pass
if sys.platform.startswith('darwin'):
try:
args = [self.get_binary_path(True, False)]
args = [self.get_binary_path(kwargs["release"], not kwargs["release"])]
osmesa_path = path.join(find_dep_path_newest('osmesa-src', args[0]),
"out", "src", "gallium", "targets", "osmesa", ".libs")
glapi_path = path.join(find_dep_path_newest('osmesa-src', args[0]),