From 5ba09ec5a0c36bc75a875dfc2ec6dbfe2a049479 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 9 Nov 2018 11:38:41 +0100 Subject: [PATCH] interrogate: fix compile error when building with LINK_ALL_STATIC Fixes #442 --- dtool/src/interrogate/interfaceMakerPythonNative.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index c0316ee5c4..1a2282d83f 100644 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -1495,11 +1495,15 @@ write_module_support(ostream &out, ostream *out_h, InterrogateModuleDef *def) { out << " {nullptr, nullptr, 0, nullptr}\n" << "};\n\n"; - out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, "; if (_external_imports.empty()) { - out << "nullptr};\n"; + out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n"; } else { - out << "imports};\n"; + out << + "#ifdef LINK_ALL_STATIC\n" + "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n" + "#else\n" + "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, imports};\n" + "#endif\n"; } if (out_h != nullptr) { *out_h << "extern const struct LibraryDef " << def->library_name << "_moddef;\n";