Ensure that monoclr is linked as a C++ library

filmor · filmor · commit ce7e1fbebddc · 2020-05-10T21:20:12.000+02:00
diff --git a/setup.py b/setup.py
@@ -285,8 +285,8 @@ def build_extension(self, ext):
                 if "libpython" not in lddout:
                     enable_shared = False
 
-            if not enable_shared:
-                defines.append("PYTHON_WITHOUT_ENABLE_SHARED")
+            #if not enable_shared:
+            #    defines.append("PYTHON_WITHOUT_ENABLE_SHARED")
 
         if hasattr(sys, "abiflags"):
             if "d" in sys.abiflags:
@@ -406,6 +406,7 @@ def _build_monoclr(self):
         # build the clr python module
         clr_ext = Extension(
             "clr",
+            language="c++",
             sources=["src/monoclr/pynetinit.c", "src/monoclr/clrmod.c"],
             extra_compile_args=cflags.split(" "),
             extra_link_args=libs.split(" "),
diff --git a/src/monoclr/pynetclr.h b/src/monoclr/pynetclr.h
@@ -13,6 +13,10 @@
 #define MONO_DOMAIN "Python.Runtime"
 #define PR_ASSEMBLY "Python.Runtime.dll"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct
 {
     MonoDomain *domain;
@@ -30,4 +34,8 @@ void PyNet_Finalize(PyNet_Args *);
 void main_thread_handler(gpointer user_data);
 char *PyNet_ExceptionToString(MonoObject *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // PYNET_CLR_H
