callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Visual Studio Projects: Use NMake Makefile to copy build results

Browse Source 
... and so stop using gtk3-install.[vsprops|props], and remove that
property sheet from the dist and dist the NMake Makefile for the
purpose.

Also remove win32/vs10/gtk3-install.vcxproj.filters as well, as it is
no longer needed.

We will remove the gtk3-install.[vsprops|[props][.in] in a subsequent
commit.
This commit is contained in:
Chun-wei Fan 2022-05-16 17:45:52 +08:00
parent 3b5b8bbebe
commit 455686a57f
14 changed files with 63 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
win32/Makefile.am
View File

@ -46,6 +46,7 @@ EXTRA_DIST += \
generate-msvc.mak \ generate-msvc.mak \
gtk-introspection-msvc.mak \ gtk-introspection-msvc.mak \
introspection-msvc.mak \ introspection-msvc.mak \
install-msvc.mak \
replace.py \ replace.py \
pc_base.py \ pc_base.py \
gtkpc.py \ gtkpc.py \

3
win32/vs10/Makefile.am
View File

@ -19,7 +19,6 @@ GENERATED_ITEMS = \
gtk3-icon-browser.vcxproj.filters \ gtk3-icon-browser.vcxproj.filters \
gailutil-3.vcxproj \ gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \ gailutil-3.vcxproj.filters \
gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
MSVC10_HEADERS_LISTS = \ MSVC10_HEADERS_LISTS = \
@ -60,12 +59,10 @@ EXTRA_DIST += \
gailutil-3.vcxprojin \ gailutil-3.vcxprojin \
gailutil-3.vcxproj.filtersin \ gailutil-3.vcxproj.filtersin \
gtk3-install.vcxproj \ gtk3-install.vcxproj \
gtk3-install.vcxproj.filters \
gtk3-introspect.vcxproj \ gtk3-introspect.vcxproj \
gtk3-build-defines.props \ gtk3-build-defines.props \
gtk3-copy-gdk-broadway.props \ gtk3-copy-gdk-broadway.props \
gtk3-ignore-broadway.props \ gtk3-ignore-broadway.props \
gtk3-install.propsin \
gtk3-version-paths.props.in \ gtk3-version-paths.props.in \
$(GENERATED_ITEMS) $(GENERATED_ITEMS)

6
win32/vs10/gtk3-build-defines.props
View File

@ -32,6 +32,9 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
<GenerateRequiredSourcesBase>cd .. <GenerateRequiredSourcesBase>cd ..
set VCInstallDir=$(VCInstallDir) set VCInstallDir=$(VCInstallDir)
nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase> nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
<InstallBuildsBase>cd ..
set VCInstallDir=$(VCInstallDir)
nmake -f install-msvc.mak PREFIX=$(GlibEtcInstallRoot)</InstallBuildsBase>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName> <_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName>
@ -117,5 +120,8 @@ nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSources
<BuildMacro Include="GenerateRequiredSourcesBase"> <BuildMacro Include="GenerateRequiredSourcesBase">
<Value>$(GenerateRequiredSourcesBase)</Value> <Value>$(GenerateRequiredSourcesBase)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="InstallBuildsBase">
<Value>$(InstallBuildsBase)</Value>
</BuildMacro>
</ItemGroup> </ItemGroup>
</Project> </Project>

130
win32/vs10/gtk3-install.vcxproj
View File

@ -41,46 +41,46 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v100</PlatformToolset>
</PropertyGroup> </PropertyGroup>
@ -89,133 +89,43 @@
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk3-install.props" /> <Import Project="gtk3-build-defines.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir> <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(InstallBuildsBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(InstallBuildsBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir> <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(InstallBuildsBase) CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(InstallBuildsBase) CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
<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'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="..\..\config.h.win32">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">blah;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">blah;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">blah;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build Results...</Message>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">blah;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\gtkpc.py">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkPC)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenerateGtkPC) --broadway</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkPCX64)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenerateGtkPCX64) --broadway</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkPC)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenerateGtkPC) --broadway</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkPCX64)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Generating .pc files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenerateGtkPCX64) --broadway</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="gdk-3.vcxproj"> <ProjectReference Include="gdk-3.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project> <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>

13
win32/vs10/gtk3-install.vcxproj.filters
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
<CustomBuild Include="..\gtkpc.py"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>

2
win32/vs11/Makefile.am
View File

@ -27,7 +27,6 @@ EXTRA_DIST += \
gailutil-3.vcxproj \ gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \ gailutil-3.vcxproj.filters \
gtk3-install.vcxproj \ gtk3-install.vcxproj \
gtk3-install.vcxproj.filters \
gtk3-introspect.vcxproj \ gtk3-introspect.vcxproj \
broadwayd.vcxproj \ broadwayd.vcxproj \
broadwayd.vcxproj.filters \ broadwayd.vcxproj.filters \
@ -36,7 +35,6 @@ EXTRA_DIST += \
gtk3-build-defines.props \ gtk3-build-defines.props \
gtk3-copy-gdk-broadway.props \ gtk3-copy-gdk-broadway.props \
gtk3-ignore-broadway.props \ gtk3-ignore-broadway.props \
gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)

2
win32/vs12/Makefile.am
View File

@ -27,7 +27,6 @@ EXTRA_DIST += \
gailutil-3.vcxproj \ gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \ gailutil-3.vcxproj.filters \
gtk3-install.vcxproj \ gtk3-install.vcxproj \
gtk3-install.vcxproj.filters \
gtk3-introspect.vcxproj \ gtk3-introspect.vcxproj \
broadwayd.vcxproj \ broadwayd.vcxproj \
broadwayd.vcxproj.filters \ broadwayd.vcxproj.filters \
@ -36,7 +35,6 @@ EXTRA_DIST += \
gtk3-build-defines.props \ gtk3-build-defines.props \
gtk3-copy-gdk-broadway.props \ gtk3-copy-gdk-broadway.props \
gtk3-ignore-broadway.props \ gtk3-ignore-broadway.props \
gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)

2
win32/vs14/Makefile.am
View File

@ -27,7 +27,6 @@ EXTRA_DIST += \
gailutil-3.vcxproj \ gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \ gailutil-3.vcxproj.filters \
gtk3-install.vcxproj \ gtk3-install.vcxproj \
gtk3-install.vcxproj.filters \
gtk3-introspect.vcxproj \ gtk3-introspect.vcxproj \
broadwayd.vcxproj \ broadwayd.vcxproj \
broadwayd.vcxproj.filters \ broadwayd.vcxproj.filters \
@ -36,7 +35,6 @@ EXTRA_DIST += \
gtk3-build-defines.props \ gtk3-build-defines.props \
gtk3-copy-gdk-broadway.props \ gtk3-copy-gdk-broadway.props \
gtk3-ignore-broadway.props \ gtk3-ignore-broadway.props \
gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)

2
win32/vs15/Makefile.am
View File

@ -27,7 +27,6 @@ EXTRA_DIST_COPIED = \
gailutil-3.vcxproj \ gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \ gailutil-3.vcxproj.filters \
gtk3-install.vcxproj \ gtk3-install.vcxproj \
gtk3-install.vcxproj.filters \
gtk3-introspect.vcxproj \ gtk3-introspect.vcxproj \
broadwayd.vcxproj \ broadwayd.vcxproj \
broadwayd.vcxproj.filters \ broadwayd.vcxproj.filters \
@ -36,7 +35,6 @@ EXTRA_DIST_COPIED = \
gtk3-build-defines.props \ gtk3-build-defines.props \
gtk3-copy-gdk-broadway.props \ gtk3-copy-gdk-broadway.props \
gtk3-ignore-broadway.props \ gtk3-ignore-broadway.props \
gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST_COPIED) DISTCLEANFILES = $(EXTRA_DIST_COPIED)

2
win32/vs16/Makefile.am
View File

@ -27,7 +27,6 @@ EXTRA_DIST += \
gailutil-3.vcxproj \ gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \ gailutil-3.vcxproj.filters \
gtk3-install.vcxproj \ gtk3-install.vcxproj \
gtk3-install.vcxproj.filters \
gtk3-introspect.vcxproj \ gtk3-introspect.vcxproj \
broadwayd.vcxproj \ broadwayd.vcxproj \
broadwayd.vcxproj.filters \ broadwayd.vcxproj.filters \
@ -36,7 +35,6 @@ EXTRA_DIST += \
gtk3-build-defines.props \ gtk3-build-defines.props \
gtk3-copy-gdk-broadway.props \ gtk3-copy-gdk-broadway.props \
gtk3-ignore-broadway.props \ gtk3-ignore-broadway.props \
gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)

2
win32/vs17/Makefile.am
View File

@ -27,7 +27,6 @@ EXTRA_DIST += \
gailutil-3.vcxproj \ gailutil-3.vcxproj \
gailutil-3.vcxproj.filters \ gailutil-3.vcxproj.filters \
gtk3-install.vcxproj \ gtk3-install.vcxproj \
gtk3-install.vcxproj.filters \
gtk3-introspect.vcxproj \ gtk3-introspect.vcxproj \
broadwayd.vcxproj \ broadwayd.vcxproj \
broadwayd.vcxproj.filters \ broadwayd.vcxproj.filters \
@ -36,7 +35,6 @@ EXTRA_DIST += \
gtk3-build-defines.props \ gtk3-build-defines.props \
gtk3-copy-gdk-broadway.props \ gtk3-copy-gdk-broadway.props \
gtk3-ignore-broadway.props \ gtk3-ignore-broadway.props \
gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)

2
win32/vs9/Makefile.am
View File

@ -17,7 +17,6 @@ GENERATED_ITEMS = \
gtk3-demo-application.vcproj \ gtk3-demo-application.vcproj \
gtk3-icon-browser.vcproj \ gtk3-icon-browser.vcproj \
gailutil-3.vcproj \ gailutil-3.vcproj \
gtk3-install.vsprops \
gtk3-version-paths.vsprops gtk3-version-paths.vsprops
EXTRA_DIST += \ EXTRA_DIST += \
@ -42,7 +41,6 @@ EXTRA_DIST += \
gtk3-build-defines.vsprops \ gtk3-build-defines.vsprops \
gtk3-copy-gdk-broadway.vsprops \ gtk3-copy-gdk-broadway.vsprops \
gtk3-ignore-broadway.vsprops \ gtk3-ignore-broadway.vsprops \
gtk3-install.vspropsin \
gtk3-version-paths.vsprops.in \ gtk3-version-paths.vsprops.in \
$(GENERATED_ITEMS) $(GENERATED_ITEMS)

4
win32/vs9/gtk3-build-defines.vsprops
View File

@ -99,4 +99,8 @@
Name="GenerateRequiredSourcesBase" Name="GenerateRequiredSourcesBase"
Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)" Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)"
/> />
<UserMacro
Name="InstallBuildsBase"
Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f install-msvc.mak PREFIX=$(GlibEtcInstallRoot)"
/>
</VisualStudioPropertySheet> </VisualStudioPropertySheet>

79
win32/vs9/gtk3-install.vcproj
View File

@ -21,113 +21,98 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
ConfigurationType="10" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
ConfigurationType="10" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_Broadway|Win32" Name="Debug_Broadway|Win32"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
IntermediateDirectory="$(ConfigurationName)" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
ConfigurationType="10"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=Debug $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) BROADWAY=1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_Broadway|x64" Name="Debug_Broadway|x64"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
ConfigurationType="10" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=Debug $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) BROADWAY=1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
IntermediateDirectory="$(ConfigurationName)" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
ConfigurationType="10"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
ConfigurationType="10" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release_Broadway|Win32" Name="Release_Broadway|Win32"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
IntermediateDirectory="$(ConfigurationName)" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
ConfigurationType="10"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=Release $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) BROADWAY=1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release_Broadway|x64" Name="Release_Broadway|x64"
OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="0"
ConfigurationType="10" InheritedPropertySheets=".\gtk3-build-defines.vsprops"
InheritedPropertySheets=".\gtk3-install.vsprops"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCNMakeTool"
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)" BuildCommandLine="$(InstallBuildsBase) CFG=Release $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) BROADWAY=1"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>