diff --git a/Cantera/matlab/SConscript b/Cantera/matlab/SConscript index 216b162a1..7bb2b58db 100644 --- a/Cantera/matlab/SConscript +++ b/Cantera/matlab/SConscript @@ -39,6 +39,8 @@ localenv.Command('build_cantera.m', MatlabBuilder(libs)) localenv['ENV']['PATH'] = os.environ['PATH'] +if 'TEMP' in os.environ: + localenv['ENV']['TEMP'] = os.environ['TEMP'] build_cmd = 'cd ${SOURCE.dir} && "%(matlab_cmd)s" -nojvm -nosplash -r build_cantera' @@ -47,6 +49,10 @@ if os.name == 'posix': mexFile = 'cantera/ctmethods.mexa%i' % localenv['OS_BITS'] elif os.name == 'nt': mexFile = 'cantera/ctmethods.mexw%i' % localenv['OS_BITS'] + if localenv['OS_BITS'] == 64: + localenv['ENV']['PROCESSOR_ARCHITECTURE'] = "AMD64" + else: + localenv['ENV']['PROCESSOR_ARCHITECTURE'] = "x86" target = localenv.Command(mexFile, 'build_cantera.m', diff --git a/SConstruct b/SConstruct index 22a7f0bdf..663cc0a01 100644 --- a/SConstruct +++ b/SConstruct @@ -194,7 +194,9 @@ opts.AddVariables( 'default', ('y', 'n', 'default')), PathVariable( 'matlab_cmd', - 'Path to the Matlab executable.', + """Path to the Matlab executable. In Windows, this is probably + something like "C:/Program Files/MATLAB/R2009a/bin/win64/MATLAB.exe" + """, 'matlab', PathVariable.PathAccept), EnumVariable( 'f90_interface',