[cogl] Fix Visual C++ 2008 "install" process

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [cogl] Fix Visual C++ 2008 "install" process
Date: Fri, 14 Dec 2012 03:11:51 +0000 (UTC)
commit 2f64c2e31738c97e4dc0a314b3b5957ccdb23259
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Dec 14 11:11:30 2012 +0800

    Fix Visual C++ 2008 "install" process
    
    Like the Visual Studio 2010 builds, the install project needs to be split
    into two, one for the WGL-only configs and another for the WGL+SDL
    configs, so that the Cogl and Cogl-Pango DLLs and LIBs can be correctly
    copied during the "install" stage, as the resulting DLLs for all configs
    land in {Release|Debug}\{Win32|x64}\bin.

 build/win32/vs9/Makefile.am        |    1 +
 build/win32/vs9/cogl_sdl.sln       |   82 +++++++++---------
 build/win32/vs9/install.vcproj     |  160 ++++++++++++++++++------------------
 build/win32/vs9/install_sdl.vcproj |   91 ++++++++++++++++++++
 4 files changed, 213 insertions(+), 121 deletions(-)
---
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 56296cf..96b0a06 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -14,4 +14,5 @@ EXTRA_DIST = \
 	cogl-msaa.vcproj	\
 	cogl-info.vcproj	\
 	install.vcproj	\
+	install_sdl.vcproj	\
 	README.txt
diff --git a/build/win32/vs9/cogl_sdl.sln b/build/win32/vs9/cogl_sdl.sln
index 5e9f25c..e9bf176 100644
--- a/build/win32/vs9/cogl_sdl.sln
+++ b/build/win32/vs9/cogl_sdl.sln
@@ -40,7 +40,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "te
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install_sdl", "install_sdl.vcproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 		{F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493}
@@ -76,14 +76,14 @@ Global
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.Build.0 = Release|Win32
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.ActiveCfg = Release|x64
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.Build.0 = Release|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.ActiveCfg = Debug_SDL|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.Build.0 = Debug_SDL|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.ActiveCfg = Debug_SDL|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.Build.0 = Debug_SDL|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.ActiveCfg = Release_SDL|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release_SDL|Win32
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release_SDL|x64
-		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release_SDL|x64
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.Build.0 = Debug|Win32
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.ActiveCfg = Debug|x64
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.Build.0 = Debug|x64
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.ActiveCfg = Release|Win32
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release|Win32
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release|x64
+		{F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release|x64
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|Win32.Build.0 = Debug|Win32
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|x64.ActiveCfg = Debug|x64
@@ -92,38 +92,38 @@ Global
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|Win32.Build.0 = Release|Win32
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.ActiveCfg = Release|x64
 		{0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.Build.0 = Release|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug_SDL|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug_SDL|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug_SDL|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug_SDL|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release_SDL|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release_SDL|Win32
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release_SDL|x64
-		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.Build.0 = Release_SDL|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug_SDL|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug_SDL|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug_SDL|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.Build.0 = Debug_SDL|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.ActiveCfg = Release_SDL|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.Build.0 = Release_SDL|Win32
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.ActiveCfg = Release_SDL|x64
-		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.Build.0 = Release_SDL|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.ActiveCfg = Debug_SDL|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.Build.0 = Debug_SDL|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.ActiveCfg = Debug_SDL|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.Build.0 = Debug_SDL|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.ActiveCfg = Release_SDL|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.Build.0 = Release_SDL|Win32
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.ActiveCfg = Release_SDL|x64
-		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.Build.0 = Release_SDL|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug_SDL|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug_SDL|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug_SDL|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug_SDL|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release_SDL|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release_SDL|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release_SDL|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release_SDL|x64
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64
+		{44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.Build.0 = Release|x64
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.Build.0 = Debug|x64
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.ActiveCfg = Release|Win32
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.Build.0 = Release|Win32
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.ActiveCfg = Release|x64
+		{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.Build.0 = Release|x64
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.Build.0 = Debug|Win32
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.ActiveCfg = Debug|x64
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.Build.0 = Debug|x64
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.ActiveCfg = Release|Win32
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.Build.0 = Release|Win32
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.ActiveCfg = Release|x64
+		{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.Build.0 = Release|x64
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
+		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index f2e013d..e5c2986 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="install"
-	ProjectGUID="{35B2A4AC-7235-4FC7-995D-469D59195041}"
-	RootNamespace="install"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(CoglDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(CoglDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(CoglDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(CoglDoInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="install"
+	ProjectGUID="{35B2A4AC-7235-4FC7-995D-469D59195041}"
+	RootNamespace="install"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(CoglDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(CoglDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(CoglDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(CoglDoInstall)"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/install_sdl.vcproj b/build/win32/vs9/install_sdl.vcproj
new file mode 100644
index 0000000..acbcc1d
--- /dev/null
+++ b/build/win32/vs9/install_sdl.vcproj
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="install"
+	ProjectGUID="{35B2A4AC-7235-4FC7-995D-469D59195041}"
+	RootNamespace="install_sdl"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\cogl.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="
+$(CoglDoInstall)
+$(CoglDoInstallSDL)
+				            "
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]