Attachment 18187 Details for Bug 17043 – This patch updates the project files for MSVC 2005

[patch] This patch updates the project files for MSVC 2005

20080809-cairomm-msvc-update.patch (text/plain), 17.86 KB, created by Armin Burgmeier on 2008-08-09 02:58:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Armin Burgmeier

Created: 2008-08-09 02:58:47 UTC

Size: 17.86 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 73bcb7b..fc0f2d6 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,17 @@
>+2008-08-09  Armin Burgmeier  <armin@arbur.net>
>+
>+	* MSVC_Net2005/cairomm/cairomm.rc.in: Removed #include "resource.h"
>+	since there is no resource.h, and it works well without that include.
>+
>+	* MSVC_Net2005/cairomm/Makefile.am: Copy cairommconfig.h from
>+	cairomm/, so it is available to the visual studio project.
>+
>+	* MSVC_Net2005/cairomm/cairomm.vcproj: Added
>+	cairomm/context_surface_win32.cc to the project.
>+
>+	* Makefile.am:
>+	* configure.in: Adapt build files.
>+
> 2008-04-25  Jonathon Jongsma  <jjongsma@gnome.org>
> 
> 	* cairomm/context.h: removed extra unused function declarations
>diff --git a/MSVC_Net2005/README b/MSVC_Net2005/README
>index 81886cd..f347d15 100644
>--- a/MSVC_Net2005/README
>+++ b/MSVC_Net2005/README
>@@ -3,7 +3,7 @@ Building cairomm-1.0 with Visual Studio .NET 2005
> * You will need Visual Studio .NET 2005 (MSVC 8.0).  Earlier versions of the compiler, including 6.0 and 7.0 might also work but have not been tested.
> * Install the latest Win32 GTK+ Development Environment from the Glade for Windows project, http://gladewin32.sourceforge.net.
> * Add libsigc++ to the include and lib paths in Visual Studio.
>-* Load the cairomm/MSVC3/cairomm.sln solution.
>+* Load the cairomm/MSVC_Net2005/cairomm.sln solution.
> * Build the entire solution.
> * Run the tests.
> 
>diff --git a/MSVC_Net2005/cairomm/.gitignore b/MSVC_Net2005/cairomm/.gitignore
>new file mode 100644
>index 0000000..458a248
>--- /dev/null
>+++ b/MSVC_Net2005/cairomm/.gitignore
>@@ -0,0 +1,2 @@
>+cairomm.rc
>+cairommconfig.h
>diff --git a/MSVC_Net2005/cairomm/Makefile.am b/MSVC_Net2005/cairomm/Makefile.am
>index b0c0ced..2b6fcdb 100644
>--- a/MSVC_Net2005/cairomm/Makefile.am
>+++ b/MSVC_Net2005/cairomm/Makefile.am
>@@ -1,5 +1,12 @@
>-BUILT_SOURCES = cairomm.rc
>+BUILT_SOURCES = cairommconfig.h cairomm.rc
> 
> MAINTAINERCLEANFILES = $(built_sources)
> 
>-EXTRA_DIST = cairomm.vcproj cairomm.rc
>+EXTRA_DIST = cairommconfig.h cairomm.vcproj cairomm.rc
>+
>+# Copy config file generated by the configure script. Dependency is
>+# wht respect to the .h.in file, to prevent an error with 'make distcheck'.
>+# See http://sources.redhat.com/automake/automake.html#distcleancheck
>+
>+cairommconfig.h: $(top_srcdir)/cairomm/cairommconfig.h.in $(top_srcdir)/configure.in
>+	cp -f $(top_builddir)/cairomm/cairommconfig.h $@
>diff --git a/MSVC_Net2005/cairomm/cairomm.rc.in b/MSVC_Net2005/cairomm/cairomm.rc.in
>index 8c968cf..537237f 100644
>--- a/MSVC_Net2005/cairomm/cairomm.rc.in
>+++ b/MSVC_Net2005/cairomm/cairomm.rc.in
>@@ -1,4 +1,3 @@
>-#include "resource.h"
> 
> #define APSTUDIO_READONLY_SYMBOLS
> 
>diff --git a/MSVC_Net2005/cairomm/cairomm.vcproj b/MSVC_Net2005/cairomm/cairomm.vcproj
>index ff0136d..ab9b9c6 100644
>--- a/MSVC_Net2005/cairomm/cairomm.vcproj
>+++ b/MSVC_Net2005/cairomm/cairomm.vcproj
>@@ -1,310 +1,330 @@
>-<?xml version="1.0" encoding="Windows-1252"?>
>-<VisualStudioProject
>-	ProjectType="Visual C++"
>-	Version="8.00"
>-	Name="cairomm-1.0"
>-	ProjectGUID="{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
>-	RootNamespace="glibmm"
>-	Keyword="Win32Proj"
>-	>
>-	<Platforms>
>-		<Platform
>-			Name="Win32"
>-		/>
>-	</Platforms>
>-	<ToolFiles>
>-	</ToolFiles>
>-	<Configurations>
>-		<Configuration
>-			Name="Debug|Win32"
>-			OutputDirectory="Debug"
>-			IntermediateDirectory="Debug"
>-			ConfigurationType="2"
>-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>-			CharacterSet="2"
>-			>
>-			<Tool
>-				Name="VCPreBuildEventTool"
>-			/>
>-			<Tool
>-				Name="VCCustomBuildTool"
>-			/>
>-			<Tool
>-				Name="VCXMLDataGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCWebServiceProxyGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCMIDLTool"
>-			/>
>-			<Tool
>-				Name="VCCLCompilerTool"
>-				Optimization="0"
>-				AdditionalIncludeDirectories=".;../.."
>-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD"
>-				MinimalRebuild="true"
>-				BasicRuntimeChecks="3"
>-				RuntimeLibrary="3"
>-				RuntimeTypeInfo="true"
>-				UsePrecompiledHeader="0"
>-				WarningLevel="3"
>-				Detect64BitPortabilityProblems="false"
>-				DebugInformationFormat="4"
>-			/>
>-			<Tool
>-				Name="VCManagedResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCPreLinkEventTool"
>-				Description="Generate cairomm def file"
>-				CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
>-				ExcludedFromBuild="false"
>-			/>
>-			<Tool
>-				Name="VCLinkerTool"
>-				AdditionalDependencies="cairo.lib"
>-				OutputFile="$(OutDir)/$(ProjectName)d.dll"
>-				GenerateManifest="true"
>-				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
>-				GenerateDebugInformation="true"
>-			/>
>-			<Tool
>-				Name="VCALinkTool"
>-			/>
>-			<Tool
>-				Name="VCManifestTool"
>-			/>
>-			<Tool
>-				Name="VCXDCMakeTool"
>-			/>
>-			<Tool
>-				Name="VCBscMakeTool"
>-			/>
>-			<Tool
>-				Name="VCFxCopTool"
>-			/>
>-			<Tool
>-				Name="VCAppVerifierTool"
>-			/>
>-			<Tool
>-				Name="VCWebDeploymentTool"
>-			/>
>-			<Tool
>-				Name="VCPostBuildEventTool"
>-			/>
>-		</Configuration>
>-		<Configuration
>-			Name="Release|Win32"
>-			OutputDirectory="Release"
>-			IntermediateDirectory="Release"
>-			ConfigurationType="2"
>-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>-			CharacterSet="2"
>-			>
>-			<Tool
>-				Name="VCPreBuildEventTool"
>-			/>
>-			<Tool
>-				Name="VCCustomBuildTool"
>-			/>
>-			<Tool
>-				Name="VCXMLDataGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCWebServiceProxyGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCMIDLTool"
>-			/>
>-			<Tool
>-				Name="VCCLCompilerTool"
>-				AdditionalIncludeDirectories=".;../.."
>-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD"
>-				RuntimeLibrary="2"
>-				RuntimeTypeInfo="true"
>-				UsePrecompiledHeader="0"
>-				WarningLevel="3"
>-				Detect64BitPortabilityProblems="false"
>-				DebugInformationFormat="3"
>-			/>
>-			<Tool
>-				Name="VCManagedResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCPreLinkEventTool"
>-				Description="Generate cairomm def file"
>-				CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
>-				ExcludedFromBuild="false"
>-			/>
>-			<Tool
>-				Name="VCLinkerTool"
>-				AdditionalDependencies="cairo.lib"
>-				GenerateManifest="true"
>-				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
>-			/>
>-			<Tool
>-				Name="VCALinkTool"
>-			/>
>-			<Tool
>-				Name="VCManifestTool"
>-			/>
>-			<Tool
>-				Name="VCXDCMakeTool"
>-			/>
>-			<Tool
>-				Name="VCBscMakeTool"
>-			/>
>-			<Tool
>-				Name="VCFxCopTool"
>-			/>
>-			<Tool
>-				Name="VCAppVerifierTool"
>-			/>
>-			<Tool
>-				Name="VCWebDeploymentTool"
>-			/>
>-			<Tool
>-				Name="VCPostBuildEventTool"
>-			/>
>-		</Configuration>
>-	</Configurations>
>-	<References>
>-	</References>
>-	<Files>
>-		<Filter
>-			Name="Source Files"
>-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
>-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>-			>
>-			<File
>-				RelativePath="..\blank.cpp"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\context.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\exception.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\fontface.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\fontoptions.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\path.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\pattern.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\private.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\scaledfont.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\surface.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\win32_surface.cc"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\xlib_surface.cc"
>-				>
>-			</File>
>-		</Filter>
>-		<Filter
>-			Name="Header Files"
>-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
>-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>-			>
>-			<File
>-				RelativePath="..\..\cairomm\cairomm.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\context.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\enums.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\exception.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\fontface.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\fontoptions.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\path.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\pattern.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\private.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\refptr.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\scaledfont.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\surface.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\win32_surface.h"
>-				>
>-			</File>
>-			<File
>-				RelativePath="..\..\cairomm\xlib_surface.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}"
>-			>
>-			<File
>-				RelativePath=".\cairomm.rc"
>-				>
>-			</File>
>-		</Filter>
>-	</Files>
>-	<Globals>
>-	</Globals>
>-</VisualStudioProject>
>+<?xml version="1.0" encoding="Windows-1252"?>
>+<VisualStudioProject
>+	ProjectType="Visual C++"
>+	Version="8.00"
>+	Name="cairomm-1.0"
>+	ProjectGUID="{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
>+	RootNamespace="glibmm"
>+	Keyword="Win32Proj"
>+	>
>+	<Platforms>
>+		<Platform
>+			Name="Win32"
>+		/>
>+	</Platforms>
>+	<ToolFiles>
>+	</ToolFiles>
>+	<Configurations>
>+		<Configuration
>+			Name="Debug|Win32"
>+			OutputDirectory="Debug"
>+			IntermediateDirectory="Debug"
>+			ConfigurationType="2"
>+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>+			CharacterSet="2"
>+			>
>+			<Tool
>+				Name="VCPreBuildEventTool"
>+			/>
>+			<Tool
>+				Name="VCCustomBuildTool"
>+			/>
>+			<Tool
>+				Name="VCXMLDataGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCWebServiceProxyGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCMIDLTool"
>+			/>
>+			<Tool
>+				Name="VCCLCompilerTool"
>+				Optimization="0"
>+				AdditionalIncludeDirectories=".;../.."
>+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CAIROMM_BUILD"
>+				MinimalRebuild="true"
>+				BasicRuntimeChecks="3"
>+				RuntimeLibrary="3"
>+				RuntimeTypeInfo="true"
>+				UsePrecompiledHeader="0"
>+				WarningLevel="3"
>+				Detect64BitPortabilityProblems="false"
>+				DebugInformationFormat="4"
>+			/>
>+			<Tool
>+				Name="VCManagedResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCPreLinkEventTool"
>+				Description="Generate cairomm def file"
>+				CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
>+				ExcludedFromBuild="false"
>+			/>
>+			<Tool
>+				Name="VCLinkerTool"
>+				AdditionalDependencies="cairo.lib"
>+				OutputFile="$(OutDir)/$(ProjectName)d.dll"
>+				GenerateManifest="true"
>+				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
>+				GenerateDebugInformation="true"
>+			/>
>+			<Tool
>+				Name="VCALinkTool"
>+			/>
>+			<Tool
>+				Name="VCManifestTool"
>+			/>
>+			<Tool
>+				Name="VCXDCMakeTool"
>+			/>
>+			<Tool
>+				Name="VCBscMakeTool"
>+			/>
>+			<Tool
>+				Name="VCFxCopTool"
>+			/>
>+			<Tool
>+				Name="VCAppVerifierTool"
>+			/>
>+			<Tool
>+				Name="VCWebDeploymentTool"
>+			/>
>+			<Tool
>+				Name="VCPostBuildEventTool"
>+			/>
>+		</Configuration>
>+		<Configuration
>+			Name="Release|Win32"
>+			OutputDirectory="Release"
>+			IntermediateDirectory="Release"
>+			ConfigurationType="2"
>+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>+			CharacterSet="2"
>+			>
>+			<Tool
>+				Name="VCPreBuildEventTool"
>+			/>
>+			<Tool
>+				Name="VCCustomBuildTool"
>+			/>
>+			<Tool
>+				Name="VCXMLDataGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCWebServiceProxyGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCMIDLTool"
>+			/>
>+			<Tool
>+				Name="VCCLCompilerTool"
>+				AdditionalIncludeDirectories=".;../.."
>+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CAIROMM_BUILD"
>+				RuntimeLibrary="2"
>+				RuntimeTypeInfo="true"
>+				UsePrecompiledHeader="0"
>+				WarningLevel="3"
>+				Detect64BitPortabilityProblems="false"
>+				DebugInformationFormat="3"
>+			/>
>+			<Tool
>+				Name="VCManagedResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCPreLinkEventTool"
>+				Description="Generate cairomm def file"
>+				CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
>+				ExcludedFromBuild="false"
>+			/>
>+			<Tool
>+				Name="VCLinkerTool"
>+				AdditionalDependencies="cairo.lib"
>+				GenerateManifest="true"
>+				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
>+			/>
>+			<Tool
>+				Name="VCALinkTool"
>+			/>
>+			<Tool
>+				Name="VCManifestTool"
>+			/>
>+			<Tool
>+				Name="VCXDCMakeTool"
>+			/>
>+			<Tool
>+				Name="VCBscMakeTool"
>+			/>
>+			<Tool
>+				Name="VCFxCopTool"
>+			/>
>+			<Tool
>+				Name="VCAppVerifierTool"
>+			/>
>+			<Tool
>+				Name="VCWebDeploymentTool"
>+			/>
>+			<Tool
>+				Name="VCPostBuildEventTool"
>+			/>
>+		</Configuration>
>+	</Configurations>
>+	<References>
>+	</References>
>+	<Files>
>+		<Filter
>+			Name="Source Files"
>+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
>+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>+			>
>+			<File
>+				RelativePath="..\blank.cpp"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\context.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\context_surface_quartz.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\context_surface_win32.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\context_surface_xlib.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\exception.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\fontface.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\fontoptions.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\path.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\pattern.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\private.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\quartz_surface.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\scaledfont.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\surface.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\win32_surface.cc"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\xlib_surface.cc"
>+				>
>+			</File>
>+		</Filter>
>+		<Filter
>+			Name="Header Files"
>+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
>+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>+			>
>+			<File
>+				RelativePath="..\..\cairomm\cairomm.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\context.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\enums.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\exception.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\fontface.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\fontoptions.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\path.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\pattern.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\private.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\quartz_surface.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\refptr.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\scaledfont.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\surface.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\win32_surface.h"
>+				>
>+			</File>
>+			<File
>+				RelativePath="..\..\cairomm\xlib_surface.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}"
>+			>
>+			<File
>+				RelativePath=".\cairomm.rc"
>+				>
>+			</File>
>+		</Filter>
>+	</Files>
>+	<Globals>
>+	</Globals>
>+</VisualStudioProject>
>diff --git a/Makefile.am b/Makefile.am
>index 8d5ce0e..6223f8c 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -1,6 +1,6 @@
> ## Process this file with automake to produce Makefile.in
> 
>-SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR) tests
>+SUBDIRS = cairomm examples MSVC_Net2005 $(DOCS_SUBDIR) tests
> #docs examples
> ACLOCAL_AMFLAGS = -I m4
> 
>diff --git a/configure.in b/configure.in
>index 315cf98..55c7b82 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -184,16 +184,16 @@ AC_CONFIG_FILES(
> )
> 
> AC_CONFIG_FILES([
>-  MSVC/Makefile
>-    MSVC/gendef/Makefile
>-    MSVC/cairomm/Makefile
>-    MSVC/cairomm/cairomm.rc
>-    MSVC/examples/Makefile
>-      MSVC/examples/pdf-surface/Makefile
>-      MSVC/examples/png_file/Makefile
>-      MSVC/examples/ps-surface/Makefile
>-      MSVC/examples/svg-surface/Makefile
>-      MSVC/examples/text-rotate/Makefile
>+  MSVC_Net2005/Makefile
>+    MSVC_Net2005/gendef/Makefile
>+    MSVC_Net2005/cairomm/Makefile
>+    MSVC_Net2005/cairomm/cairomm.rc
>+    MSVC_Net2005/examples/Makefile
>+      MSVC_Net2005/examples/pdf-surface/Makefile
>+      MSVC_Net2005/examples/png_file/Makefile
>+      MSVC_Net2005/examples/ps-surface/Makefile
>+      MSVC_Net2005/examples/svg-surface/Makefile
>+      MSVC_Net2005/examples/text-rotate/Makefile
> ])
> 
> AC_OUTPUT()

Actions: View | Splinter Review

Attachments on bug 17043: 18187

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.