From d4eb54e2c85531195b5f19b36321a41cb3b5f19e Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Fri, 7 Apr 2017 16:32:36 +0200 Subject: [PATCH] Move Windows dependencies to x86 directory The current Windows dependencies are all 32bit. To compile a 64bit Graphviz, 64bit dependencies are required. In order to have both the 32bit and 64bit libraries, we store the 32bit libraries in the x86 folder. --- CMakeLists.txt | 2 +- cmd/smyrna/smyrna.vcxproj | 104 +++++++++--------- cmd/tools/graphml2gv.vcxproj | 12 +- cmd/tools/gvpack.vcxproj | 4 +- cmd/tools/gxl2gv.vcxproj | 12 +- contrib/diffimg/diffimg.vcxproj | 12 +- lib/glcomp/glcomp.vcxproj | 4 +- lib/gvc.vcxproj | 24 ++-- lib/mingle/minglelib.vcxproj | 12 +- plugin/gd/gvplugin_gd.vcxproj | 40 +++---- .../gvplugin_neato_layout.vcxproj | 4 +- plugin/pango/gvplugin_pango.vcxproj | 76 ++++++------- windows/dependencies/libraries | 2 +- 13 files changed, 154 insertions(+), 154 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6e1ae1ff..b1e5bcc79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ set(MAN_INSTALL_DIR share/man/man3) # set(MAN_PDF_INSTALL_DIR share/graphviz/doc/pdf) set(TOP_SOURCE_DIR "${CMAKE_SOURCE_DIR}") set(GRAPHVIZ_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib") -set(WINDOWS_DEPENDENCY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries") +set(WINDOWS_DEPENDENCY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries/x86") set(GRAPHVIZ_PLUGIN_VERSION 6) # Name of the config file used by Graphviz diff --git a/cmd/smyrna/smyrna.vcxproj b/cmd/smyrna/smyrna.vcxproj index b935b1005..6c67d00f8 100644 --- a/cmd/smyrna/smyrna.vcxproj +++ b/cmd/smyrna/smyrna.vcxproj @@ -52,7 +52,7 @@ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) Disabled - $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -65,43 +65,43 @@ getopt.lib;ast.lib;atk-1.0.lib;libcairo-2.lib;cdt.lib;cgraph.lib;expr.lib;fontconfig.lib;freetype.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;jpeg.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;sfio.lib;topfish.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) true Console MachineX86 - copy $(SolutionDir)windows\dependencies\libraries\bin\libcairo-2.dll $(OutDir)libcairo-2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpng12.dll $(OutDir)libpng12.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libxml2.dll $(OutDir)libxml2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\intl.dll $(OutDir)intl.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgdkglext-win32-1.0-0.dll $(OutDir)libgdkglext-win32-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgdk-win32-2.0-0.dll $(OutDir)libgdk-win32-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgdk_pixbuf-2.0-0.dll $(OutDir)libgdk_pixbuf-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libglade-2.0-0.dll $(OutDir)libglade-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libatk-1.0-0.dll $(OutDir)libatk-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgtk-win32-2.0-0.dll $(OutDir)libgtk-win32-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\freeglut.dll $(OutDir)freeglut.dll -xcopy /E $(SolutionDir)windows\dependencies\libraries\lib\pango $(OutDir)..\lib\pango\ + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\intl.dll $(OutDir)intl.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgdkglext-win32-1.0-0.dll $(OutDir)libgdkglext-win32-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgdk-win32-2.0-0.dll $(OutDir)libgdk-win32-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgdk_pixbuf-2.0-0.dll $(OutDir)libgdk_pixbuf-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglade-2.0-0.dll $(OutDir)libglade-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libatk-1.0-0.dll $(OutDir)libatk-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgtk-win32-2.0-0.dll $(OutDir)libgtk-win32-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\freeglut.dll $(OutDir)freeglut.dll +xcopy /E $(SolutionDir)windows\dependencies\libraries\x86\lib\pango $(OutDir)..\lib\pango\ if not exist "$(OutDir)..\etc\pango\" mkdir $(OutDir)..\etc\pango\ -$(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules +$(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules - $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded @@ -111,7 +111,7 @@ $(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(O getopt.lib;ast.lib;atk-1.0.lib;libcairo-2.lib;cdt.lib;cgraph.lib;expr.lib;fontconfig.lib;freetype.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;jpeg.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;sfio.lib;topfish.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) No Console true @@ -120,31 +120,31 @@ $(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(O MachineX86 - copy $(SolutionDir)windows\dependencies\libraries\bin\libcairo-2.dll $(OutDir)libcairo-2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpng12.dll $(OutDir)libpng12.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libxml2.dll $(OutDir)libxml2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\intl.dll $(OutDir)intl.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgdkglext-win32-1.0-0.dll $(OutDir)libgdkglext-win32-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgdk-win32-2.0-0.dll $(OutDir)libgdk-win32-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgdk_pixbuf-2.0-0.dll $(OutDir)libgdk_pixbuf-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libglade-2.0-0.dll $(OutDir)libglade-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libatk-1.0-0.dll $(OutDir)libatk-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgtk-win32-2.0-0.dll $(OutDir)libgtk-win32-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\freeglut.dll $(OutDir)freeglut.dll -xcopy /E $(SolutionDir)windows\dependencies\libraries\lib\pango $(OutDir)..\lib\pango\ + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\intl.dll $(OutDir)intl.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgdkglext-win32-1.0-0.dll $(OutDir)libgdkglext-win32-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgdk-win32-2.0-0.dll $(OutDir)libgdk-win32-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgdk_pixbuf-2.0-0.dll $(OutDir)libgdk_pixbuf-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglade-2.0-0.dll $(OutDir)libglade-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libatk-1.0-0.dll $(OutDir)libatk-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgtk-win32-2.0-0.dll $(OutDir)libgtk-win32-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\freeglut.dll $(OutDir)freeglut.dll +xcopy /E $(SolutionDir)windows\dependencies\libraries\x86\lib\pango $(OutDir)..\lib\pango\ if not exist "$(OutDir)..\etc\pango\" mkdir $(OutDir)..\etc\pango\ -$(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules +$(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules diff --git a/cmd/tools/graphml2gv.vcxproj b/cmd/tools/graphml2gv.vcxproj index 4ddb51967..4313f400a 100644 --- a/cmd/tools/graphml2gv.vcxproj +++ b/cmd/tools/graphml2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -68,16 +68,16 @@ true Console MachineX86 - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libexpat.dll $(OutDir)libexpat.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded @@ -91,11 +91,11 @@ true true MachineX86 - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libexpat.dll $(OutDir)libexpat.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll diff --git a/cmd/tools/gvpack.vcxproj b/cmd/tools/gvpack.vcxproj index 9cc687a7b..3aaddf925 100644 --- a/cmd/tools/gvpack.vcxproj +++ b/cmd/tools/gvpack.vcxproj @@ -65,7 +65,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) true Console @@ -84,7 +84,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) No Console true diff --git a/cmd/tools/gxl2gv.vcxproj b/cmd/tools/gxl2gv.vcxproj index 025756fc5..1d6ae46fe 100644 --- a/cmd/tools/gxl2gv.vcxproj +++ b/cmd/tools/gxl2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -65,7 +65,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) true Console @@ -73,12 +73,12 @@ getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libexpat.dll $(OutDir)libexpat.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) MultiThreaded @@ -87,7 +87,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) No Console true @@ -97,7 +97,7 @@ getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libexpat.dll $(OutDir)libexpat.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll diff --git a/contrib/diffimg/diffimg.vcxproj b/contrib/diffimg/diffimg.vcxproj index f373258b2..26a50f006 100644 --- a/contrib/diffimg/diffimg.vcxproj +++ b/contrib/diffimg/diffimg.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include _DEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -63,7 +63,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) true Console @@ -71,12 +71,12 @@ libgd.lib;gvc.lib;png.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libgd.dll $(OutDir)libgd.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include NDEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) MultiThreaded @@ -85,7 +85,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) No Console true @@ -95,7 +95,7 @@ libgd.lib;gvc.lib;png.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libgd.dll $(OutDir)libgd.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll diff --git a/lib/glcomp/glcomp.vcxproj b/lib/glcomp/glcomp.vcxproj index 9ee658d41..59dc6a2fc 100644 --- a/lib/glcomp/glcomp.vcxproj +++ b/lib/glcomp/glcomp.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) _DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -66,7 +66,7 @@ - $(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj index d4889e0da..f4d007bd7 100644 --- a/lib/gvc.vcxproj +++ b/lib/gvc.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) MSWIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -63,7 +63,7 @@ 4996 - $(SolutionDir)windows\dependencies\libraries\lib;$(OutDir);%(AdditionalLibraryDirectories) + $(SolutionDir)windows\dependencies\libraries\x86\lib;$(OutDir);%(AdditionalLibraryDirectories) true Windows @@ -83,15 +83,15 @@ type common\brewer_lib common\svgcolor_lib common\color_names | sort /L C > c awk -f $(SolutionDir)awk\colortbl.awk color_lib > common\colortbl.h - copy $(SolutionDir)windows\dependencies\libraries\bin\libltdl3.dll $(OutDir)libltdl3.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\rxspencer.dll $(OutDir)rxspencer.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libexpat.dll $(OutDir)libexpat.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libltdl3.dll $(OutDir)libltdl3.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\rxspencer.dll $(OutDir)rxspencer.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded @@ -100,7 +100,7 @@ copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.d 4996 - $(SolutionDir)windows\dependencies\libraries\lib;$(OutDir);%(AdditionalLibraryDirectories) + $(SolutionDir)windows\dependencies\libraries\x86\lib;$(OutDir);%(AdditionalLibraryDirectories) No Windows true @@ -122,10 +122,10 @@ type common\brewer_lib common\svgcolor_lib common\color_names | sort /L C > c awk -f $(SolutionDir)awk\colortbl.awk color_lib > common\colortbl.h - copy $(SolutionDir)windows\dependencies\libraries\bin\libltdl3.dll $(OutDir)libltdl3.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\rxspencer.dll $(OutDir)rxspencer.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libexpat.dll $(OutDir)libexpat.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libltdl3.dll $(OutDir)libltdl3.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\rxspencer.dll $(OutDir)rxspencer.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll diff --git a/lib/mingle/minglelib.vcxproj b/lib/mingle/minglelib.vcxproj index db9d88aaf..1f3982a98 100644 --- a/lib/mingle/minglelib.vcxproj +++ b/lib/mingle/minglelib.vcxproj @@ -54,7 +54,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -70,17 +70,17 @@ ANN.lib - $(SolutionDir)windows\dependencies\libraries\lib + $(SolutionDir)windows\dependencies\libraries\x86\lib - copy $(SolutionDir)windows\dependencies\libraries\bin\ANN.dll $(OutDir)ANN.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\ANN.dll $(OutDir)ANN.dll MaxSpeed true - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -94,10 +94,10 @@ ANN.lib - $(SolutionDir)windows\dependencies\libraries\lib + $(SolutionDir)windows\dependencies\libraries\x86\lib - copy $(SolutionDir)windows\dependencies\libraries\bin\ANN.dll $(OutDir)ANN.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\ANN.dll $(OutDir)ANN.dll diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj index 4ab2a4028..778e98df5 100644 --- a/plugin/gd/gvplugin_gd.vcxproj +++ b/plugin/gd/gvplugin_gd.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) true EnableFastChecks MultiThreadedDebugDLL @@ -62,7 +62,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) true Windows @@ -70,19 +70,19 @@ cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;z.lib;pathplan.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libgd.dll $(OutDir)libgd.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libcairo-2.dll $(OutDir)libcairo-2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpng12.dll $(OutDir)libpng12.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libxml2.dll $(OutDir)libxml2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) MultiThreadedDLL Level4 @@ -90,7 +90,7 @@ copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.d 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) No Windows true @@ -100,14 +100,14 @@ copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.d cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;z.lib;pathplan.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libgd.dll $(OutDir)libgd.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libcairo-2.dll $(OutDir)libcairo-2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpng12.dll $(OutDir)libpng12.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libxml2.dll $(OutDir)libxml2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.dll + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcxproj b/plugin/neato_layout/gvplugin_neato_layout.vcxproj index 82b9f5238..c71037152 100644 --- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj +++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj @@ -62,7 +62,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) true Windows @@ -80,7 +80,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) No Windows true diff --git a/plugin/pango/gvplugin_pango.vcxproj b/plugin/pango/gvplugin_pango.vcxproj index 12153f997..2262b6b65 100644 --- a/plugin/pango/gvplugin_pango.vcxproj +++ b/plugin/pango/gvplugin_pango.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) true EnableFastChecks MultiThreadedDebugDLL @@ -62,7 +62,7 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) true Windows @@ -70,29 +70,29 @@ gvc.lib;glib-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;libcairo-2.lib;gobject-2.0.lib;cgraph.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libcairo-2.dll $(OutDir)libcairo-2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpng12.dll $(OutDir)libpng12.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libxml2.dll $(OutDir)libxml2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\intl.dll $(OutDir)intl.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll -xcopy /E $(SolutionDir)windows\dependencies\libraries\lib\pango $(OutDir)..\lib\pango\ + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\intl.dll $(OutDir)intl.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll +xcopy /E $(SolutionDir)windows\dependencies\libraries\x86\lib\pango $(OutDir)..\lib\pango\ if not exist "$(OutDir)..\etc\pango\" mkdir $(OutDir)..\etc\pango\ -$(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules +$(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\include;$(SolutionDir)windows\dependencies\libraries\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) MultiThreaded Level4 @@ -100,7 +100,7 @@ $(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(O 4996 - $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories) No Windows true @@ -110,24 +110,24 @@ $(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(O gvc.lib;glib-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;libcairo-2.lib;gobject-2.0.lib;cgraph.lib;%(AdditionalDependencies) - copy $(SolutionDir)windows\dependencies\libraries\bin\libcairo-2.dll $(OutDir)libcairo-2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpng12.dll $(OutDir)libpng12.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\zlib1.dll $(OutDir)zlib1.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libxml2.dll $(OutDir)libxml2.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\iconv.dll $(OutDir)iconv.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\intl.dll $(OutDir)intl.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll -copy $(SolutionDir)windows\dependencies\libraries\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll -xcopy /E $(SolutionDir)windows\dependencies\libraries\lib\pango $(OutDir)..\lib\pango\ + copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\intl.dll $(OutDir)intl.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll +copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll +xcopy /E $(SolutionDir)windows\dependencies\libraries\x86\lib\pango $(OutDir)..\lib\pango\ if not exist "$(OutDir)..\etc\pango\" mkdir $(OutDir)..\etc\pango\ -$(SolutionDir)windows\dependencies\libraries\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules +$(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe > $(OutDir)..\etc\pango\pango.modules diff --git a/windows/dependencies/libraries b/windows/dependencies/libraries index 7cb2b3437..7735f6066 160000 --- a/windows/dependencies/libraries +++ b/windows/dependencies/libraries @@ -1 +1 @@ -Subproject commit 7cb2b3437a3d104d869a534a780805b27d086a6a +Subproject commit 7735f606611a3ee07fb15713265465365c19d698 -- 2.40.0