From: John Ellson <john.ellson@comcast.net>
Date: Sat, 9 Jul 2016 13:48:08 +0000 (-0400)
Subject: Merge pull request #96 from ErwinJanssen/windows-build
X-Git-Tag: untagged-fd4ca25a4ca4e4dc471c~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7ff0d41908f4ed8eb8f6d26d3cb63d3dfb67018;p=graphviz

Merge pull request #96 from ErwinJanssen/windows-build

Windows build
---

b7ff0d41908f4ed8eb8f6d26d3cb63d3dfb67018
diff --cc plugin/core/gvplugin_core.c
index 1710c4df0,8ffd61996..77c31b1ac
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.c
@@@ -16,10 -16,11 +16,12 @@@
  extern gvplugin_installed_t gvdevice_dot_types[];
  extern gvplugin_installed_t gvdevice_fig_types[];
  extern gvplugin_installed_t gvdevice_map_types[];
 +extern gvplugin_installed_t gvdevice_mp_types[];
  extern gvplugin_installed_t gvdevice_ps_types[];
  extern gvplugin_installed_t gvdevice_svg_types[];
+ #if !defined(WIN32)
  extern gvplugin_installed_t gvdevice_json_types[];
+ #endif
  extern gvplugin_installed_t gvdevice_tk_types[];
  extern gvplugin_installed_t gvdevice_vml_types[];
  extern gvplugin_installed_t gvdevice_pic_types[];
@@@ -28,10 -29,11 +30,12 @@@ extern gvplugin_installed_t gvdevice_po
  extern gvplugin_installed_t gvrender_dot_types[];
  extern gvplugin_installed_t gvrender_fig_types[];
  extern gvplugin_installed_t gvrender_map_types[];
 +extern gvplugin_installed_t gvrender_mp_types[];
  extern gvplugin_installed_t gvrender_ps_types[];
  extern gvplugin_installed_t gvrender_svg_types[];
+ #if !defined(WIN32)
  extern gvplugin_installed_t gvrender_json_types[];
+ #endif
  extern gvplugin_installed_t gvrender_tk_types[];
  extern gvplugin_installed_t gvrender_vml_types[];
  extern gvplugin_installed_t gvrender_pic_types[];
@@@ -46,10 -48,11 +50,12 @@@ static gvplugin_api_t apis[] = 
      {API_device, gvdevice_dot_types},
      {API_device, gvdevice_fig_types},
      {API_device, gvdevice_map_types},
 +    {API_device, gvdevice_mp_types},
      {API_device, gvdevice_ps_types},
      {API_device, gvdevice_svg_types},
+ #if !defined(WIN32)
      {API_device, gvdevice_json_types},
+ #endif
      {API_device, gvdevice_tk_types},
      {API_device, gvdevice_vml_types},
      {API_device, gvdevice_pic_types},
@@@ -58,10 -61,11 +64,12 @@@
      {API_render, gvrender_dot_types},
      {API_render, gvrender_fig_types},
      {API_render, gvrender_map_types},
 +    {API_render, gvrender_mp_types},
      {API_render, gvrender_ps_types},
      {API_render, gvrender_svg_types},
+ #if !defined(WIN32)
      {API_render, gvrender_json_types},
+ #endif
      {API_render, gvrender_tk_types},
      {API_render, gvrender_vml_types},
      {API_render, gvrender_pic_types},