Commit 2d95aab6 authored by Erwin Janssen's avatar Erwin Janssen

Replace Windows' pragma linking with VS linking

In various places, mostly the projects in `cmd` and `plugin`, had a
`#pragma comment( lib, "libname.lib" )` in the source code for linking
under Windows. Were possible, these have been removed and replaced link
specifications in the Visual Studio project files.
This seperates the linking from the source code and makes transitioning to
other build systems easier.
parent 6e79d2fe
......@@ -24,8 +24,6 @@
__declspec(dllimport) boolean MemTest;
__declspec(dllimport) int GvExitOnUsage;
/*gvc.lib cgraph.lib*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#else /* not WIN32_DLL */
#include "globals.h"
#endif
......
......@@ -68,6 +68,7 @@
<SubSystem>Console</SubSystem>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>cgraph.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -88,6 +89,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>cgraph.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -66,7 +66,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>lab_gamut.lib;getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>lab_gamut.lib;getopt.lib;cdt.lib;cgraph.lib;gvc.lib;ingraphs.lib;sfdp.lib;sparse.lib;edgepaintlib.lib;neatogen.lib;rbtree.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
......@@ -87,7 +87,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>lab_gamut.lib;getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>lab_gamut.lib;getopt.lib;cdt.lib;cgraph.lib;gvc.lib;ingraphs.lib;sfdp.lib;sparse.lib;edgepaintlib.lib;neatogen.lib;rbtree.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>No</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
......
......@@ -10,18 +10,6 @@
#include "config.h"
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "sparse.lib" )
#pragma comment( lib, "sfdp.lib" )
#pragma comment( lib, "edgepaintlib.lib" )
#pragma comment( lib, "neatogen.lib" )
#pragma comment( lib, "rbtree.lib" )
#pragma comment( lib, "cdt.lib" )
#endif /* not WIN32_DLL */
#include <cgraph.h>
#include <agxbuf.h>
#include <ingraphs.h>
......
......@@ -40,32 +40,6 @@ enum {maxlen = 10000000};
enum {MAX_GRPS = 10000};
static char swork[maxlen];
#ifdef WIN32
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "sparse.lib" )
#pragma comment( lib, "neatogen.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "pathplan.lib" )
#pragma comment( lib, "neatogen.lib" )
#pragma comment( lib, "edgepaintlib.lib" )
#pragma comment( lib, "circogen.lib" )
#pragma comment( lib, "twopigen.lib" )
#pragma comment( lib, "fdpgen.lib" )
#pragma comment( lib, "sparse.lib" )
#pragma comment( lib, "cdt.lib" )
//#pragma comment( lib, "gts.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "vpsc.lib" )
#pragma comment( lib, "patchwork.lib" )
#pragma comment( lib, "gvortho.lib" )
#pragma comment( lib, "sfdp.lib" )
#pragma comment( lib, "rbtree.lib" )
#endif /* not WIN32_DLL */
#if 0
void *gmalloc(size_t nbytes)
{
......
......@@ -67,7 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;gvc.lib;ingraphs.lib;sparse.lib;neatogen.lib;pathplan.lib;edgepaintlib.lib;circogen.lib;twopigen.lib;fdpgen.lib;cdt.lib;vpsc.lib;patchwork.lib;gvortho.lib;sfdp.lib;rbtree.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -87,7 +87,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;gvc.lib;ingraphs.lib;sparse.lib;neatogen.lib;pathplan.lib;edgepaintlib.lib;circogen.lib;twopigen.lib;fdpgen.lib;cdt.lib;vpsc.lib;patchwork.lib;gvortho.lib;sfdp.lib;rbtree.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -70,6 +70,7 @@
<SubSystem>Console</SubSystem>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;gvprlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -90,6 +91,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;gvprlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -31,17 +31,6 @@
#include "gvpr.h"
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "gvprlib.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
#endif
#ifdef DEBUG
#include "sfio.h"
static ssize_t outfn (void* sp, const char *buf, size_t nbyte, void* dp)
......
......@@ -70,7 +70,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;gvc.lib;ingraphs.lib;sparse.lib;sfdp.lib;minglelib.lib;neatogen.lib;rbtree.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\ANN\ANN.dll $(OutDir)ANN.dll</Command>
......@@ -96,7 +96,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;gvc.lib;ingraphs.lib;sparse.lib;sfdp.lib;minglelib.lib;neatogen.lib;rbtree.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\ANN\ANN.dll $(OutDir)ANN.dll</Command>
......
......@@ -10,18 +10,6 @@
#include "config.h"
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "sparse.lib" )
#pragma comment( lib, "sfdp.lib" )
#pragma comment( lib, "minglelib.lib" )
#pragma comment( lib, "neatogen.lib" )
#pragma comment( lib, "rbtree.lib" )
#pragma comment( lib, "cdt.lib" )
#endif /* not WIN32_DLL */
#include <cgraph.h>
#include <agxbuf.h>
#include <ingraphs.h>
......
......@@ -17,16 +17,6 @@
* Updated by Emden Gansner
*/
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
#include "config.h"
#ifdef HAVE_UNISTD_H
......
......@@ -70,7 +70,7 @@
<SubSystem>Console</SubSystem>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>No</GenerateDebugInformation>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -27,13 +27,6 @@
#include <stdlib.h>
#include "cgraph.h"
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
typedef struct {
Agrec_t h;
Agraph_t *next;
......
......@@ -65,7 +65,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
......@@ -84,7 +84,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<GenerateDebugInformation>No</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
......
......@@ -11,13 +11,6 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
#endif
#include "config.h"
#include <stdio.h>
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -18,11 +18,6 @@
#include "config.h"
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -29,12 +29,6 @@ static char* gname = "";
static FILE *outFile;
static char *CmdName;
static char **Files;
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
#endif
static FILE *getFile(void)
{
......
......@@ -69,7 +69,7 @@
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>flex -o gmlscan-intermediate.c -i gmlscan.l
......@@ -99,7 +99,7 @@ del gmlparse-intermediate.c</Command>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>flex -o gmlscan-intermediate.c -i gmlscan.l
......
......@@ -19,15 +19,6 @@
#include <expat.h>
#include <ctype.h>
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "libexpat.lib" )
#endif
#ifndef XML_STATUS_ERROR
#define XML_STATUS_ERROR 0
#endif
......
......@@ -69,7 +69,7 @@
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll</Command>
......@@ -92,7 +92,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll</Command>
......
......@@ -14,12 +14,6 @@
* AT&T Research, Florham Park NJ *
**********************************************************/
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
#endif
#include "config.h"
#include <stdio.h>
......
......@@ -69,7 +69,7 @@
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -89,7 +89,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -19,12 +19,6 @@
#include "config.h"
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
#endif
/* if NC changes, a bunch of scanf calls below are in trouble */
#define NC 3 /* size of HSB color vector */
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -15,11 +15,6 @@
* Written by Emden Gansner
*/
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
#include "config.h"
#include <stdio.h>
......
......@@ -66,7 +66,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -86,7 +86,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -29,21 +29,6 @@
#include "ingraphs.h"
#include "pack.h"
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "neatogen.lib" )
#pragma comment( lib, "pathplan.lib" )
#pragma comment( lib, "vpsc.lib" )
#pragma comment( lib, "sparse.lib" )
//#pragma comment( lib, "gts.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "gvplugin_neato_layout.lib" )
#endif
/*visual studio*/
#if defined(WIN32)
#define extern __declspec(dllimport)
......
......@@ -70,7 +70,7 @@
<SubSystem>Console</SubSystem>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;neatogen.lib;pathplan.lib;vpsc.lib;sparse.lib;glib-2.0.lib;gvplugin_neato_layout.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;neatogen.lib;pathplan.lib;vpsc.lib;sparse.lib;glib-2.0.lib;gvplugin_neato_layout.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -18,15 +18,6 @@
#include <expat.h>
#include <ctype.h>
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "libexpat.lib" )
#endif
#ifndef XML_STATUS_ERROR
#define XML_STATUS_ERROR 0
#endif
......
......@@ -70,7 +70,7 @@
<SubSystem>Console</SubSystem>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll</Command>
......@@ -94,7 +94,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll</Command>
......
......@@ -33,14 +33,6 @@
#define real double
#define BUFS 1024
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "sparse.lib" )
#endif
typedef struct {
Agrec_t h;
int id;
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;gvc.lib;sparse.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;gvc.lib;sparse.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -31,11 +31,6 @@ static char *useString = "Usage: nop [-p?] <files>\n\
-? - print usage\n\
If no files are specified, stdin is used\n";
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
static void usage(int v)
{
printf("%s",useString);
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -36,11 +36,6 @@
#define INF ((unsigned int)(-1))
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
typedef struct Agraphinfo_t {
Agrec_t h;
Agnode_t *rep;
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -45,11 +45,6 @@ char **Files;
char *CmdName;
#define MARK(n) (((Agnodeinfo_t*)(n->base.data))->mark)
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
static int dfs(Agnode_t * n, Agedge_t * link, int warn)
{
Agedge_t *e;
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -37,11 +37,6 @@ static Agnode_t *ChainNode;
static FILE *outFile;
static char *cmd;
#ifdef WIN32 //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
static int myindegree(Agnode_t *n)
{
return agdegree(n->root, n, TRUE, FALSE);
......
......@@ -70,7 +70,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -91,7 +91,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt</AdditionalLibraryDirectories>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>getopt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -23,15 +23,6 @@
* John Ellson <ellson@research.att.com>
*/
#ifdef WIN32 /*dependencies*/
#pragma comment( lib, "libgd.lib" )
#pragma comment( lib, "png.lib" )
#pragma comment( lib, "gvc.lib" )
#endif
#include "config.h"
#include <stdio.h>
......
......@@ -63,11 +63,12 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)windows\dependencies\libgd\build;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\dependencies\libgd\build;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention />