diff --git a/src/SConscript b/src/SConscript index f86ccf654..ee068343c 100644 --- a/src/SConscript +++ b/src/SConscript @@ -59,6 +59,9 @@ if localenv['OS'] == 'Darwin' and localenv['use_sundials'] == 'y': localenv.Append(LIBS=localenv['sundials_libs'], LIBPATH=localenv['sundials_libdir']) +if localenv['toolchain'] == 'mingw': + localenv.Append(LINKFLAGS=['-static-libgcc', '-static-libstdc++']) + # Build the Cantera shared library lib = build(localenv.SharedLibrary('../lib/cantera_shared', libraryTargets, SPAWN=getSpawn(localenv))) diff --git a/src/matlab/SConscript b/src/matlab/SConscript index 96c99480e..b2bb136d0 100644 --- a/src/matlab/SConscript +++ b/src/matlab/SConscript @@ -21,6 +21,9 @@ if localenv['OS'] == 'Windows': if localenv['CC'] == 'cl': linkflags.append('/export:mexFunction') linkflags.append('/MACHINE:X%i' % localenv['OS_BITS']) + elif localenv['CC'] == 'gcc': + linkflags.append('-Wl,--export-all-symbols') + linkflags.extend(['-static-libgcc', '-static-libstdc++']) elif localenv['OS'] == 'Darwin': linklibs = ['cantera'] @@ -55,6 +58,7 @@ linklibs += localenv['blas_lapack_libs'] ctmethods = build(localenv.SharedLibrary('#interfaces/matlab/toolbox/ctmethods', mglob(localenv, '.', 'cpp'), + LIBPREFIX='', SHLIBPREFIX='', SHLIBSUFFIX=mexSuffix, LIBS=linklibs,