Fix OSX GUI

docs/acknowledgments.rst

@@ -0,0 +1,22 @@
+Acknowledgments
+===============================================
+
+
+`Taichi` is based on many other open-source projects,
+which are shipped with taichi and users do not have to install manually:
+`pybind11 <https://github.com/pybind/pybind11>`_,
+`Intel Embree <https://embree.github.io/>`_,
+`Intel TBB <https://www.threadingbuildingblocks.org/>`_,
+`fmt <https://github.com/fmtlib/fmt>`_,
+`Catch2 <https://github.com/catchorg/Catch2>`_,
+`spdlog <https://github.com/gabime/spdlog>`_,
+`stb_image, stb_image_write, stb_truetype <https://github.com/nothings/stb>`_,
+`tinyobjloader <https://github.com/syoyo/tinyobjloader>`_,
+`JIXIE::ImplicitQRSVD <http://www.math.ucla.edu/~fuchuyuan/svd/paper.pdf>`_,
+`dcraw <https://www.cybercom.net/~dcoffin/dcraw>`_,
+`ffmpeg <https://www.ffmpeg.org/>`_,
+`miniz <https://github.com/richgel999/miniz>`_.
+
+Current developers include:
+ - `Yuanming Hu <http://taichi.graphics/me>`_ (project creator & main developer)
+ - `Yu Fang <http://squarefk.com/>`_ (developer)

include/taichi/visual/gui.h

@@ -5,7 +5,11 @@
 
 TC_NAMESPACE_BEGIN
 
-#if defined(TC_PLATFORM_LINUX) || defined(TC_PLATFORM_OSX)
+#if defined(TC_PLATFORM_LINUX) || (defined(TC_PLATFORM_OSX) && defined(TC_AMALGAMATED))
+#define TC_GUI_X11
+#endif
+
+#if defined(TC_GUI_X11)
 
 class Canvas {
  public:

src/gui/gui.cpp

@@ -1,7 +1,7 @@
 #include <taichi/visual/gui.h>
 #include <numeric>
 
-#if defined(TC_PLATFORM_LINUX) || defined(TC_PLATFORM_OSX)
+#if defined(TC_GUI_X11)
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>