summaryrefslogtreecommitdiff
path: root/build/win32
diff options
context:
space:
mode:
Diffstat (limited to 'build/win32')
-rw-r--r--build/win32/vs10/Makefile.am4
-rw-r--r--build/win32/vs10/gdk-pixbuf-gengir.props26
-rw-r--r--build/win32/vs10/gdk-pixbuf.sln6
-rw-r--r--build/win32/vs10/gengir.vcxproj108
-rw-r--r--build/win32/vs9/Makefile.am4
-rw-r--r--build/win32/vs9/gdk-pixbuf-gengir.vsprops21
-rw-r--r--build/win32/vs9/gdk-pixbuf.sln9
-rw-r--r--build/win32/vs9/gengir.vcproj77
8 files changed, 2 insertions, 253 deletions
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index ab593662e..5b69cb3a1 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST = \
gdk-pixbuf-version-paths.props \
gdk-pixbuf-build-defines.props \
gdk-pixbuf-gen-srcs.props \
- gdk-pixbuf-gengir.props \
gdk-pixbuf-install.props \
gdk-pixbuf.vcxproj \
gdk-pixbuf.vcxprojin \
@@ -16,7 +15,6 @@ EXTRA_DIST = \
gdk-pixbuf-query-loaders.vcxproj.filters \
gdk-pixbuf-pixdata.vcxproj \
gdk-pixbuf-pixdata.vcxproj.filters \
- install.vcxproj \
- gengir.vcxproj
+ install.vcxproj
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/gdk-pixbuf-gengir.props b/build/win32/vs10/gdk-pixbuf-gengir.props
deleted file mode 100644
index bf515e0ff..000000000
--- a/build/win32/vs10/gdk-pixbuf-gengir.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ImportGroup Label="PropertySheets">
- <Import Project="gdk-pixbuf-build-defines.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <DoGenGir>
-set VSVER=$(VSVer)
-set CONF=$(Configuration)
-set PLAT=$(Platform)
-set BASEDIR=$(GlibEtcInstallRoot)
-cd ..
-call gengir_gdkpixbuf.bat
-
-cd vs$(VSVer)
- </DoGenGir>
- </PropertyGroup>
- <PropertyGroup>
- <_PropertySheetDisplayName>gdk-pixbufgengirprops</_PropertySheetDisplayName>
- </PropertyGroup>
- <ItemGroup>
- <BuildMacro Include="DoGenGir">
- <Value>$(DoGenGir)</Value>
- </BuildMacro>
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/build/win32/vs10/gdk-pixbuf.sln b/build/win32/vs10/gdk-pixbuf.sln
index fe8522685..26d2d2e55 100644
--- a/build/win32/vs10/gdk-pixbuf.sln
+++ b/build/win32/vs10/gdk-pixbuf.sln
@@ -11,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-query-loaders",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-pixdata", "gdk-pixbuf-pixdata.vcxproj", "{2AD2FF07-0514-41A8-8A32-920C744EA1A6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_NoGDIP|Win32 = Debug_NoGDIP|Win32
@@ -105,10 +103,6 @@ Global
{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|Win32.Build.0 = Release|Win32
{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.ActiveCfg = Release|x64
{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.Build.0 = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs10/gengir.vcxproj b/build/win32/vs10/gengir.vcxproj
deleted file mode 100644
index 39d6ad0bc..000000000
--- a/build/win32/vs10/gengir.vcxproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B15}</ProjectGuid>
- <RootNamespace>gengir</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v100</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v100</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gdk-pixbuf-gengir.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gdk-pixbuf-gengir.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gdk-pixbuf-gengir.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gdk-pixbuf-gengir.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>$(DoGenGir)</Command>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <PreBuildEvent>
- <Command>$(DoGenGir)</Command>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>$(DoGenGir)</Command>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <PreBuildEvent>
- <Command>$(DoGenGir)</Command>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ProjectReference Include="gdk-pixbuf.vcxproj">
- <Project>{01ade22d-f6ec-4d09-8fe1-b9a97dec2ba3}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index f44dae848..0dee01731 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -4,14 +4,12 @@ EXTRA_DIST = \
gdk-pixbuf-version-paths.vsprops \
gdk-pixbuf-build-defines.vsprops \
gdk-pixbuf-gen-srcs.vsprops \
- gdk-pixbuf-gengir.vsprops \
gdk-pixbuf-install.vsprops \
gdk-pixbuf.vcproj \
gdk-pixbuf.vcprojin \
gdk-pixbuf-csource.vcproj \
gdk-pixbuf-query-loaders.vcproj \
gdk-pixbuf-pixdata.vcproj \
- install.vcproj \
- gengir.vcproj
+ install.vcproj
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/gdk-pixbuf-gengir.vsprops b/build/win32/vs9/gdk-pixbuf-gengir.vsprops
deleted file mode 100644
index 294e25306..000000000
--- a/build/win32/vs9/gdk-pixbuf-gengir.vsprops
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="gdk-pixbufgengirprops"
- InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
- >
- <UserMacro
- Name="DoGenGir"
- Value="
-set VSVER=$(VSVer)&#x0D;&#x0A;
-set CONF=$(ConfigurationName)&#x0D;&#x0A;
-set PLAT=$(PlatformName)&#x0D;&#x0A;
-set BASEDIR=$(GlibEtcInstallRoot)&#x0D;&#x0A;
-cd ..&#x0D;&#x0A;
-
-call gengir_gdkpixbuf.bat&#x0D;&#x0A;
-cd vs$(VSVer)&#x0D;&#x0A;
- "
- />
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf.sln b/build/win32/vs9/gdk-pixbuf.sln
index d0b8e6001..dca59db50 100644
--- a/build/win32/vs9/gdk-pixbuf.sln
+++ b/build/win32/vs9/gdk-pixbuf.sln
@@ -26,11 +26,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-pixdata", "gdk-p
{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3} = {01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
- ProjectSection(ProjectDependencies) = postProject
- {01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3} = {01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_NoGDIP|Win32 = Debug_NoGDIP|Win32
@@ -123,10 +118,6 @@ Global
{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|Win32.Build.0 = Release|Win32
{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.ActiveCfg = Release|x64
{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.Build.0 = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/gengir.vcproj b/build/win32/vs9/gengir.vcproj
deleted file mode 100644
index 854da3130..000000000
--- a/build/win32/vs9/gengir.vcproj
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="gengir"
- ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B15}"
- RootNamespace="gengir"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="$(DoGenGir)"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="$(DoGenGir)"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- WholeProgramOptimization="1"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="$(DoGenGir)"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- WholeProgramOptimization="1"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="$(DoGenGir)"
- />
- </Configuration>
- </Configurations>
-</VisualStudioProject>
View Lorry Controller Status