[cogl/cogl-1.12] Fix Visual C++ 2008 "install" process
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.12] Fix Visual C++ 2008 "install" process
- Date: Fri, 14 Dec 2012 03:08:31 +0000 (UTC)
commit 12010882e621a1c699b7be403b2b56369917530d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Dec 14 11:08:07 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 | 18 ++--
build/win32/vs9/install.vcproj | 223 +++++++++++++-----------------------
build/win32/vs9/install_sdl.vcproj | 91 +++++++++++++++
4 files changed, 181 insertions(+), 152 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 8b63b79..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}
@@ -124,14 +124,14 @@ Global
{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_SDL|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug_SDL|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug_SDL|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug_SDL|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release_SDL|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release_SDL|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release_SDL|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release_SDL|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
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index ef328d1..e5c2986 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -1,143 +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_SDL|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="VCPreBuildEventTool"
- CommandLine="$(CoglDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Debug_SDL|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)"
- />
- </Configuration>
- <Configuration
- Name="Release_SDL|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"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="$(CoglDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Release_SDL|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>
+<?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]