updated dependencies

wjakob · Feb 21, 2019 · 782c0e8 · 782c0e8
1 parent 885e4fc
commit 782c0e8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ rules.ninja
 Makefile
 bin2c
 example[1-9]
+example_icons
 icons
 *~
 nanogui*.so

diff --git a/ext/glfw b/ext/glfw
diff --git a/ext/pybind11 b/ext/pybind11
diff --git a/python/main.cpp b/python/main.cpp
@@ -111,16 +111,16 @@ static void sigint_handler(int sig) {
 }
 #endif
 
-PYBIND11_PLUGIN(nanogui) {
-    py::module m("nanogui", "NanoGUI plugin");
+PYBIND11_MODULE(nanogui, m) {
+    m.attr("__doc__") = "NanoGUI plugin";
 
     py::class_<MainloopHandle>(m, "MainloopHandle")
         .def("join", &MainloopHandle::join);
 
     m.def("init", &nanogui::init, D(init));
     m.def("shutdown", &nanogui::shutdown, D(shutdown));
     m.def("mainloop", [](int refresh, py::object detach) -> MainloopHandle* {
-        if (detach != py::none()) {
+        if (!detach.is(py::none())) {
             if (handle)
                 throw std::runtime_error("Main loop is already running!");
 
@@ -248,8 +248,6 @@ PYBIND11_PLUGIN(nanogui) {
     register_misc(m);
     register_glutil(m);
     register_nanovg(m);
-
-    return m.ptr();
 }
 
 #endif
+0 −6		CMakeLists.txt
+8 −4		src/CMakeLists.txt
+1 −2		src/x11_init.c