Enable JSON on Windows build

The JSON module was not included in the Windows build because of some
errors. These errors were caused by two function from gvc not being added
to the Windows definition file. This is now resolved and JSON is added.

diff --git a/lib/gvc.def b/lib/gvc.def
index 8b35412a500f2f14a16a34e907cabb85aa70a4e2..18b6f2d241b9b8e489300225aa83634b130e82d2 100644 (file)
--- a/lib/gvc.def
+++ b/lib/gvc.def
@@ -135,6 +135,8 @@ gvContext
 gvcVersion    
 GvExitOnUsage
 Gvfilepath    
+gvCloneGVC
+gvFreeCloneGVC
 gvFreeContext    
 gvFreeLayout    
 gvLayout    

diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index 9e9a61265d34368c8727f73f43f751374624cca8..f0847dfde1123c253202d7a45d16064c5dbe43d7 100644 (file)
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.c
@@ -16,14 +16,10 @@
 extern gvplugin_installed_t gvdevice_dot_types[];
 extern gvplugin_installed_t gvdevice_fig_types[];
 extern gvplugin_installed_t gvdevice_map_types[];
-#if !defined(_WIN32)
 extern gvplugin_installed_t gvdevice_mp_types[];
-#endif
 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[];
@@ -32,14 +28,10 @@ extern gvplugin_installed_t gvdevice_pov_types[];
 extern gvplugin_installed_t gvrender_dot_types[];
 extern gvplugin_installed_t gvrender_fig_types[];
 extern gvplugin_installed_t gvrender_map_types[];
-#if !defined(_WIN32)
 extern gvplugin_installed_t gvrender_mp_types[];
-#endif
 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[];

diff --git a/plugin/core/gvplugin_core.vcxproj b/plugin/core/gvplugin_core.vcxproj
index 010e655c5c08bec5087b451aa6e9510d0af6ada8..ee323d0a949bd6841858ae93abc2242924f789b0 100644 (file)
--- a/plugin/core/gvplugin_core.vcxproj
+++ b/plugin/core/gvplugin_core.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -78,7 +78,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
@@ -109,6 +109,7 @@
     <ClCompile Include="gvplugin_core.c" />
     <ClCompile Include="gvrender_core_dot.c" />
     <ClCompile Include="gvrender_core_fig.c" />
+    <ClCompile Include="gvrender_core_json.c" />
     <ClCompile Include="gvrender_core_map.c" />
     <ClCompile Include="gvrender_core_pic.c" />
     <ClCompile Include="gvrender_core_pov.c" />

diff --git a/plugin/core/gvplugin_core.vcxproj.filters b/plugin/core/gvplugin_core.vcxproj.filters
index 7847efcf5b45fddb23aa112471e6173cf63af570..36f6dc87b85a3c996cddabbf732294509f14efd9 100644 (file)
--- a/plugin/core/gvplugin_core.vcxproj.filters
+++ b/plugin/core/gvplugin_core.vcxproj.filters
@@ -53,6 +53,9 @@
     <ClCompile Include="gvrender_core_vml.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="gvrender_core_json.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="gvplugin_core.def">