From 4afe24068b47dc5543f2b6c1cc7ef1c1cad86097 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Sun, 5 Mar 2017 13:26:36 +0100 Subject: [PATCH] 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. --- lib/gvc.def | 2 ++ plugin/core/gvplugin_core.c | 8 -------- plugin/core/gvplugin_core.vcxproj | 5 +++-- plugin/core/gvplugin_core.vcxproj.filters | 3 +++ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/gvc.def b/lib/gvc.def index 8b35412a5..18b6f2d24 100644 --- 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 9e9a61265..f0847dfde 100644 --- 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 010e655c5..ee323d0a9 100644 --- a/plugin/core/gvplugin_core.vcxproj +++ b/plugin/core/gvplugin_core.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -78,7 +78,7 @@ - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded @@ -109,6 +109,7 @@ + diff --git a/plugin/core/gvplugin_core.vcxproj.filters b/plugin/core/gvplugin_core.vcxproj.filters index 7847efcf5..36f6dc87b 100644 --- a/plugin/core/gvplugin_core.vcxproj.filters +++ b/plugin/core/gvplugin_core.vcxproj.filters @@ -53,6 +53,9 @@ Source Files + + Source Files + -- 2.40.0