brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Visual C++ 2008 "install" process

Browse Source 
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.
This commit is contained in:
Chun-wei Fan 2012-12-14 11:08:07 +08:00
parent 6c438e0df5
commit 12010882e6
4 changed files with 181 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/win32/vs9/Makefile.am
View File

@ -14,4 +14,5 @@ EXTRA_DIST = \
cogl-msaa.vcproj \ cogl-msaa.vcproj \
cogl-info.vcproj \ cogl-info.vcproj \
install.vcproj \ install.vcproj \
install_sdl.vcproj \
README.txt README.txt

18
build/win32/vs9/cogl_sdl.sln
View File

@ -40,7 +40,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "te
{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
EndProjectSection EndProjectSection
EndProject 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 ProjectSection(ProjectDependencies) = postProject
{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
{F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493} {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|Win32.Build.0 = Release|Win32
{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64 {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = 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.ActiveCfg = Debug|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug_SDL|Win32 {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug_SDL|x64 {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug_SDL|x64 {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release_SDL|Win32 {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release_SDL|Win32 {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release_SDL|x64 {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release_SDL|x64 {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

223
build/win32/vs9/install.vcproj
View File

@ -1,143 +1,80 @@
<?xml version="1.0" encoding="big5"?> <?xml version="1.0" encoding="big5"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="install" Name="install"
ProjectGUID="{35B2A4AC-7235-4FC7-995D-469D59195041}" ProjectGUID="{35B2A4AC-7235-4FC7-995D-469D59195041}"
RootNamespace="install" RootNamespace="install"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform <Platform
Name="x64" Name="x64"
/> />
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\cogl.vsprops" InheritedPropertySheets=".\cogl.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="$(CoglDoInstall)" CommandLine="$(CoglDoInstall)"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_SDL|Win32" Name="Debug|x64"
InheritedPropertySheets=".\cogl.vsprops" InheritedPropertySheets=".\cogl.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
> DeleteExtensionsOnClean=""
<Tool >
Name="VCPostBuildEventTool" <Tool
CommandLine=" Name="VCPreBuildEventTool"
$(CoglDoInstall) CommandLine="$(CoglDoInstall)"
$(CoglDoInstallSDL) />
" </Configuration>
/> <Configuration
</Configuration> Name="Release|Win32"
<Configuration InheritedPropertySheets=".\cogl.vsprops"
Name="Debug|x64" OutputDirectory="$(GlibEtcInstallRoot)"
InheritedPropertySheets=".\cogl.vsprops" ConfigurationType="10"
OutputDirectory="$(GlibEtcInstallRoot)" CharacterSet="2"
ConfigurationType="10" WholeProgramOptimization="1"
CharacterSet="2" >
DeleteExtensionsOnClean="" <Tool
> Name="VCPostBuildEventTool"
<Tool CommandLine="$(CoglDoInstall)"
Name="VCPreBuildEventTool" />
CommandLine="$(CoglDoInstall)" </Configuration>
/> <Configuration
</Configuration> Name="Release|x64"
<Configuration InheritedPropertySheets=".\cogl.vsprops"
Name="Debug_SDL|x64" OutputDirectory="$(GlibEtcInstallRoot)"
InheritedPropertySheets=".\cogl.vsprops" ConfigurationType="10"
OutputDirectory="$(GlibEtcInstallRoot)" CharacterSet="2"
ConfigurationType="10" WholeProgramOptimization="1"
CharacterSet="2" DeleteExtensionsOnClean=""
DeleteExtensionsOnClean="" >
> <Tool
<Tool Name="VCPreBuildEventTool"
Name="VCPostBuildEventTool" CommandLine="$(CoglDoInstall)"
CommandLine=" />
$(CoglDoInstall) </Configuration>
$(CoglDoInstallSDL) </Configurations>
" <References>
/> </References>
</Configuration> <Files>
<Configuration </Files>
Name="Release|Win32" <Globals>
InheritedPropertySheets=".\cogl.vsprops" </Globals>
OutputDirectory="$(GlibEtcInstallRoot)" </VisualStudioProject>
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>

91
build/win32/vs9/install_sdl.vcproj Normal file
View File

@ -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>