Merge branch 'pybind11_upgrade'

codereader · Dec 21, 2020 · 39de2db · 39de2db
2 parents 3ddc9f2 + 5e72bc8
commit 39de2db
Show file tree

Hide file tree

Showing 33 changed files with 7,177 additions and 3,220 deletions.
diff --git a/include/imodule.h b/include/imodule.h
@@ -510,5 +510,5 @@ namespace module
 #elif defined(__APPLE__)
     #define DARKRADIANT_DLLEXPORT __attribute__((visibility("default")))
 #else
-    #define DARKRADIANT_DLLEXPORT
+    #define DARKRADIANT_DLLEXPORT __attribute__((visibility("default")))
 #endif
diff --git a/include/iscriptinterface.h b/include/iscriptinterface.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <memory>
+#include <vector>
+#include <utility>
 #include <pybind11/pybind11.h>
 namespace py = pybind11;
 
@@ -10,6 +12,8 @@ namespace script
 class IScriptInterface
 {
 public:
+    using Ptr = std::shared_ptr<IScriptInterface>;
+
     virtual ~IScriptInterface() {}
 
 	/**
@@ -18,6 +22,8 @@ class IScriptInterface
 	*/
 	virtual void registerInterface(py::module& scope, py::dict& globals) = 0;
 };
-typedef std::shared_ptr<IScriptInterface> IScriptInterfacePtr;
+
+using NamedInterface = std::pair<std::string, IScriptInterface::Ptr>;
+using NamedInterfaces = std::vector<NamedInterface>;
 
 }