Commit 55b7017a authored by Emden R. Gansner's avatar Emden R. Gansner

Alter Windows build to use shared lab_gamut library;

add edgepaint to .msi package
parent 5649b9fa
......@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="lab_gamut.lib"
OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;C:\graphviz-ms\bin&quot;;C:\gtk\lib"
......@@ -136,6 +137,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="lab_gamut.lib"
OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;C:\graphviz-ms\bin&quot;;C:\gtk\lib"
......
......@@ -254,6 +254,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvmap", "cmd\gvmap\gvmap.vc
ProjectSection(ProjectDependencies) = postProject
{C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C}
{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
{A1E78E36-1C11-4AB4-AB43-8BB7933075FB} = {A1E78E36-1C11-4AB4-AB43-8BB7933075FB}
{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
{B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699}
{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
......@@ -304,6 +305,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "edgepaint", "cmd\edgepaint\
ProjectSection(ProjectDependencies) = postProject
{C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C}
{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
{A1E78E36-1C11-4AB4-AB43-8BB7933075FB} = {A1E78E36-1C11-4AB4-AB43-8BB7933075FB}
{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
{B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699}
{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
......@@ -312,6 +314,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "edgepaint", "cmd\edgepaint\
{D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lab_gamut", "lib\edgepaint\lab_gamut.vcproj", "{A1E78E36-1C11-4AB4-AB43-8BB7933075FB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -526,6 +530,10 @@ Global
{B7A03994-C134-4FF7-98B4-97B5579EF13D}.Debug|Win32.Build.0 = Debug|Win32
{B7A03994-C134-4FF7-98B4-97B5579EF13D}.Release|Win32.ActiveCfg = Release|Win32
{B7A03994-C134-4FF7-98B4-97B5579EF13D}.Release|Win32.Build.0 = Release|Win32
{A1E78E36-1C11-4AB4-AB43-8BB7933075FB}.Debug|Win32.ActiveCfg = Debug|Win32
{A1E78E36-1C11-4AB4-AB43-8BB7933075FB}.Debug|Win32.Build.0 = Debug|Win32
{A1E78E36-1C11-4AB4-AB43-8BB7933075FB}.Release|Win32.ActiveCfg = Release|Win32
{A1E78E36-1C11-4AB4-AB43-8BB7933075FB}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -19,5 +19,5 @@ lib_LTLIBRARIES = liblab_gamut.la
libedgepaint_C_la_SOURCES = edge_distinct_coloring.c furtherest_point.c intersection.c lab.c node_distinct_coloring.c
liblab_gamut_la_SOURCES = lab_gamut.c
EXTRA_DIST = edgepaintlib.vcproj
EXTRA_DIST = edgepaintlib.vcproj lab_gamut.vcproj
LIBRARY "lab_gamut"
EXPORTS
lab_gamut_data
lab_gamut_data_size
......@@ -11,11 +11,27 @@
#ifndef LAB_GAMUT_H
#define LAB_GAMUT_H
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
signed char l, a, b;/* l: 0 to 100, a,b: -128 tp 128 */
} char_color_lab;
/*visual studio*/
#if defined(WIN32) && !defined(LAB_GAMUT_EXPORTS)
#define extern __declspec(dllimport)
#endif
/*end visual studio*/
extern const char_color_lab lab_gamut_data[];
extern int lab_gamut_data_size;
#undef extern
#ifdef __cplusplus
}
#endif
#endif
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="lab_gamut"
ProjectGUID="{A1E78E36-1C11-4AB4-AB43-8BB7933075FB}"
RootNamespace="lab_gamut"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)/lib/edgepaint&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
LinkIncremental="2"
ModuleDefinitionFile="lab_gamut.def"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SolutionDir)/lib/edgepaint&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
ModuleDefinitionFile="lab_gamut.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\lab_gamut.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\lab_gamut.c"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
......@@ -501,6 +501,12 @@
}
"Entry"
{
"MsmKey" = "8:_21C4743810CB4A48A3572AC822EEA0BF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_21C69AFD4A7340DCA6D98F836B5C6BBE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
......@@ -669,6 +675,12 @@
}
"Entry"
{
"MsmKey" = "8:_29FD58C1B88948E2A27F2F901494800F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_2ABB2D0DFF904C37939C19E4DFE3E210"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
......@@ -1929,6 +1941,12 @@
}
"Entry"
{
"MsmKey" = "8:_749F77DD014D48179A82BFCA758B2EE6"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_74EEB3F85F164B9E8A8E01EA8DBF95D1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
......@@ -2139,6 +2157,12 @@
}
"Entry"
{
"MsmKey" = "8:_80AB8133C263411B830ED7D4DA57F5FB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_80BC052126CF4394B9A60FEB4A45E226"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
......@@ -2325,6 +2349,12 @@
}
"Entry"
{
"MsmKey" = "8:_8E011C9671D643D3992718AC309DF0BF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8F864387A1774B9FBD12531C531588B2"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
......@@ -3321,6 +3351,12 @@
}
"Entry"
{
"MsmKey" = "8:_CC2F295DD8A74905B6CB3BAD1D1B4699"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_CC535A1F37734920831B44F71F386391"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
......@@ -5762,6 +5798,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_21C4743810CB4A48A3572AC822EEA0BF"
{
"SourcePath" = "8:..\\..\\release\\bin\\lab_gamut.dll"
"TargetName" = "8:lab_gamut.dll"
"Tag" = "8:"
"Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_21C69AFD4A7340DCA6D98F836B5C6BBE"
{
"SourcePath" = "8:..\\..\\release\\fonts\\conf.avail\\49-sansserif.conf"
......@@ -6322,6 +6378,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FD58C1B88948E2A27F2F901494800F"
{
"SourcePath" = "8:..\\..\\release\\lib\\release\\lib\\lab_gamut.lib"
"TargetName" = "8:lab_gamut.lib"
"Tag" = "8:"
"Folder" = "8:_0F18EC14CB9E4053A952F7D6E985BA78"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2ABB2D0DFF904C37939C19E4DFE3E210"
{
"SourcePath" = "8:..\\..\\release\\share\\man\\man1\\gxl2gv.1"
......@@ -10522,6 +10598,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_749F77DD014D48179A82BFCA758B2EE6"
{
"SourcePath" = "8:..\\..\\release\\lib\\release\\dll\\lab_gamut.dll"
"TargetName" = "8:lab_gamut.dll"
"Tag" = "8:"
"Folder" = "8:_4F6E35FF8AF049FFB5270298E3BF6F4D"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_74EEB3F85F164B9E8A8E01EA8DBF95D1"
{
"SourcePath" = "8:..\\..\\release\\share\\graphviz\\smyrna\\mouse_actions.txt"
......@@ -11222,6 +11318,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_80AB8133C263411B830ED7D4DA57F5FB"
{
"SourcePath" = "8:..\\..\\release\\lib\\debug\\lib\\lab_gamut.lib"
"TargetName" = "8:lab_gamut.lib"
"Tag" = "8:"
"Folder" = "8:_E630780592AF4A139D075370DF107A89"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_80BC052126CF4394B9A60FEB4A45E226"
{
"SourcePath" = "8:..\\..\\release\\fonts\\conf.avail\\69-unifont.conf"
......@@ -11842,6 +11958,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8E011C9671D643D3992718AC309DF0BF"
{
"SourcePath" = "8:..\\..\\release\\lib\\debug\\dll\\lab_gamut.dll"
"TargetName" = "8:lab_gamut.dll"
"Tag" = "8:"
"Folder" = "8:_E95C230A024E4AE68F5A30B47956E2C4"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8F864387A1774B9FBD12531C531588B2"
{
"SourcePath" = "8:..\\..\\release\\include\\graphviz\\gvplugin.h"
......@@ -15162,6 +15298,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CC2F295DD8A74905B6CB3BAD1D1B4699"
{
"SourcePath" = "8:..\\..\\release\\bin\\edgepaint.exe"
"TargetName" = "8:edgepaint.exe"
"Tag" = "8:"
"Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CC535A1F37734920831B44F71F386391"
{
"SourcePath" = "8:..\\..\\release\\lib\\debug\\lib\\xdot.lib"
......@@ -17599,7 +17755,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_7311E34D27CB4695BDD9C87AEE0F24EA"
{
"Name" = "8:Graphviz 2.37"
"Name" = "8:Graphviz 2.39"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
......@@ -18162,7 +18318,7 @@
"RemovePreviousVersions" = "11:FALSE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:2.37"
"ProductVersion" = "8:2.39"
"Manufacturer" = "8:AT&T Research Labs."
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment