From: Erwin Janssen Date: Wed, 22 Jun 2016 19:03:56 +0000 (+0200) Subject: Windows: gvplugin_gd now building. X-Git-Tag: untagged-fd4ca25a4ca4e4dc471c~4^2~29 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d79b90f28b60150cfce6353c5d174dd11f1bf930;p=graphviz Windows: gvplugin_gd now building. --- diff --git a/plugin/gd/gvdevice_gd.c b/plugin/gd/gvdevice_gd.c index 2c50d69e9..386132204 100644 --- a/plugin/gd/gvdevice_gd.c +++ b/plugin/gd/gvdevice_gd.c @@ -18,15 +18,15 @@ #ifdef WIN32 /*dependencies*/ #pragma comment( lib, "cgraph.lib" ) - #pragma comment( lib, "libpng.lib" ) + #pragma comment( lib, "libpng12.lib" ) #pragma comment( lib, "gd.lib" ) - #pragma comment( lib, "cairo.lib" ) + #pragma comment( lib, "libcairo-2.lib" ) #pragma comment( lib, "fontconfig.lib" ) #pragma comment( lib, "gvc.lib" ) #pragma comment( lib, "freetype.lib" ) #pragma comment( lib, "iconv.lib" ) #pragma comment( lib, "jpeg.lib" ) - #pragma comment( lib, "zdll.lib" ) + #pragma comment( lib, "z.lib" ) #pragma comment( lib, "pathplan.lib" ) #endif diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj index 1edbb1330..a4d0ffbc0 100644 --- a/plugin/gd/gvplugin_gd.vcxproj +++ b/plugin/gd/gvplugin_gd.vcxproj @@ -14,6 +14,7 @@ {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} gvplugin_gd Win32Proj + 8.1 @@ -38,14 +39,16 @@ <_ProjectFileVersion>14.0.25123.0 - Debug\ + $(SolutionDir)Debug\Graphviz\bin\ Debug\ - true + AllRules.ruleset + true - Release\ + $(SolutionDir)Graphviz\bin\ Release\ - true + AllRules.ruleset + true @@ -56,12 +59,12 @@ EnableFastChecks MultiThreadedDebugDLL - TurnOffAllWarnings + Level4 EditAndContinue + true - c:/graphviz-ms/bin/$(ProjectName).dll - $(SolutionDir)windows\dependencies\GTK2\lib;C:\graphviz-ms\bin;%(AdditionalLibraryDirectories) + $(SolutionDir)windows\dependencies\GTK2\lib;$(SolutionDir)Debug\Graphviz\bin\;%(AdditionalLibraryDirectories) gvplugin_gd.def true Windows @@ -76,12 +79,12 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;NONDLL;%(PreprocessorDefinitions) MultiThreadedDLL - TurnOffAllWarnings + Level4 ProgramDatabase + true - c:/graphviz-ms/bin/$(ProjectName).dll - C:\graphviz-ms\bin;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)windows\dependencies\GTK2\lib;$(SolutionDir)Graphviz\bin\;%(AdditionalLibraryDirectories) gvplugin_gd.def true Windows diff --git a/windows/dependencies/GTK2 b/windows/dependencies/GTK2 index c2546df54..edeb5a348 160000 --- a/windows/dependencies/GTK2 +++ b/windows/dependencies/GTK2 @@ -1 +1 @@ -Subproject commit c2546df5459af06f92577d0d33e3091f944f908f +Subproject commit edeb5a34854152e1608fd61a315c2d833b699679