[gtk+] Add Visual Studio Build Support for Broadway
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Add Visual Studio Build Support for Broadway
- Date: Fri, 2 Aug 2013 09:06:45 +0000 (UTC)
commit dcb766c4617d874588de5edf397ddac017b8d760
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Aug 2 11:20:19 2013 +0800
Add Visual Studio Build Support for Broadway
-Add Visual Studio 2008 projects and pre-configured gdkconfig.h for
Broadway builds
-Decouple the Visual Studio property sheets, to simplify maintenance and
enhance flexibility for different builds
Visual Studio 2010 projects updates will follow later.
build/win32/vs9/Makefile.am | 13 ++-
build/win32/vs9/broadwayd.vcproj | 179 ++++++++++++++++++++
build/win32/vs9/gailutil.vcproj | 8 +-
build/win32/vs9/gdk-broadway.vcproj | 144 ++++++++++++++++
build/win32/vs9/gdk-win32.vcproj | 92 ++++++++++-
build/win32/vs9/gdk.vcprojin | 136 ++++++++++++++-
build/win32/vs9/gengir.vcproj | 8 +-
build/win32/vs9/gtk+.sln | 100 +++++++++++
build/win32/vs9/gtk-build-defines.vsprops | 45 +++++
build/win32/vs9/gtk-gengir.vsprops | 21 +++
build/win32/vs9/gtk-ignore-broadway.vsprops | 12 ++
build/win32/vs9/gtk-install-bin.vsprops | 37 ++++
...k+.vsprops => gtk-install-headers-data.vsprops} | 122 +------------
build/win32/vs9/gtk-version-paths.vsprops | 53 ++++++
build/win32/vs9/gtk.vcprojin | 8 +-
build/win32/vs9/gtk3-demo-application.vcproj | 8 +-
build/win32/vs9/gtk3-demo.vcproj | 8 +-
build/win32/vs9/gtka11y.vcprojin | 95 ++++++++++-
build/win32/vs9/gtkprebuild-broadway.vsprops | 27 +++
build/win32/vs9/gtkprebuild.vsprops | 27 +++
build/win32/vs9/install.vcproj | 156 ++++++++++++++++--
gdk/Makefile.am | 1 +
gdk/gdkconfig.h.win32_broadway | 23 +++
23 files changed, 1166 insertions(+), 157 deletions(-)
---
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index d52df20..c662f96 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
README.txt \
gtk+.sln \
- gtk+.vsprops \
gdk-win32.vcproj \
gdk.vcproj \
gdk.vcprojin \
@@ -15,6 +14,16 @@ EXTRA_DIST += \
gtka11y.vcprojin \
gailutil.vcproj \
gengir.vcproj \
- install.vcproj
+ install.vcproj \
+ broadwayd.vcproj \
+ gtk-broadway.vcproj \
+ gtk-build-defines.vsprops \
+ gtk-gengir.vsprops \
+ gtk-ignore-broadway.vsprops \
+ gtk-install-bin.vsprops \
+ gtk-install-headers-data.vsprops \
+ gtk-version-paths.vsprops \
+ gtkprebuild.vsprops \
+ gtkprebuild-broadway.vsprops
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/broadwayd.vcproj b/build/win32/vs9/broadwayd.vcproj
new file mode 100644
index 0000000..f436e60
--- /dev/null
+++ b/build/win32/vs9/broadwayd.vcproj
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="broadwayd"
+ ProjectGUID="{3281202A-CD26-4C67-B892-EB34BDBC6130}"
+ RootNamespace="broadwayd"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+ PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ws2_32.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(GdkDefines)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ws2_32.lib"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+ PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ws2_32.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="0"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(GdkDefines)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ws2_32.lib"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Sources"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ </Filter>
+ <File RelativePath="..\crypt\crypt3.c" />
+ <File RelativePath="..\..\..\gdk\broadway\broadwayd.c" />
+ <File RelativePath="..\..\..\gdk\broadway\broadway-output.c" />
+ <File RelativePath="..\..\..\gdk\broadway\broadway-server.c" />
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/gailutil.vcproj b/build/win32/vs9/gailutil.vcproj
index 3560e59..5667af1 100644
--- a/build/win32/vs9/gailutil.vcproj
+++ b/build/win32/vs9/gailutil.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -54,7 +54,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -87,7 +87,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -123,7 +123,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gdk-broadway.vcproj b/build/win32/vs9/gdk-broadway.vcproj
new file mode 100644
index 0000000..9618f81
--- /dev/null
+++ b/build/win32/vs9/gdk-broadway.vcproj
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="gdk-broadway"
+ ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}"
+ RootNamespace="gdkbroadway"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="$(GdkDefines)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild-broadway.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="$(GdkDefines)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File RelativePath="..\..\..\gdk\broadway\gdkcursor-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkdevice-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkdevicemanager-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkdisplay-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkdnd-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkeventsource.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkglobals-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkkeys-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkproperty-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkscreen-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkselection-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdktestutils-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkvisual-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkwindow-broadway.c" />
+ <File RelativePath="..\..\..\gdk\broadway\gdkbroadway-server.c" />
+ </Filter>
+ </Files>
+</VisualStudioProject>
diff --git a/build/win32/vs9/gdk-win32.vcproj b/build/win32/vs9/gdk-win32.vcproj
index e930fc7..0a68853 100644
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -21,7 +21,29 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -43,7 +65,27 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -63,7 +105,29 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -85,7 +149,27 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index 7a53996..26c675f 100644
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtk-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -52,8 +52,40 @@
/>
</Configuration>
<Configuration
+ Name="Debug_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+ OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtk-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -84,8 +116,40 @@
/>
</Configuration>
<Configuration
+ Name="Release_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="$(GdkDefines)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+ OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtk-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -116,8 +180,40 @@
/>
</Configuration>
<Configuration
+ Name="Debug_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+ OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtk-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -147,6 +243,38 @@
TargetMachine="17"
/>
</Configuration>
+ <Configuration
+ Name="Release_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ PreprocessorDefinitions="$(GdkDefines)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+ OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ TargetMachine="17"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
diff --git a/build/win32/vs9/gengir.vcproj b/build/win32/vs9/gengir.vcproj
index ef20564..185b9f6 100644
--- a/build/win32/vs9/gengir.vcproj
+++ b/build/win32/vs9/gengir.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -34,7 +34,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -47,7 +47,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -61,7 +61,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln
index 9c33cd6..0ca913f 100644
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -1,10 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj",
"{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj",
"{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
ProjectSection(ProjectDependencies) = postProject
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj",
"{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
@@ -26,6 +30,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gt
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj",
"{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+ProjectSection(ProjectDependencies) = postProject
+ {3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj",
"{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
ProjectSection(ProjectDependencies) = postProject
@@ -40,6 +47,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
{3281202A-CD26-4C67-B892-EB34BDBC612F} = {3281202A-CD26-4C67-B892-EB34BDBC612F}
+ {3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj",
"{2093D218-190E-4194-9421-3BA7CBF33B15}"
@@ -48,12 +56,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", "
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-broadway", "gdk-broadway.vcproj",
"{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcproj",
"{3281202A-CD26-4C67-B892-EB34BDBC6130}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug_Broadway|Win32 = Debug_Broadway|Win32
Debug|x64 = Debug|x64
+ Debug_Broadway|x64 = Debug_Broadway|x64
Release|Win32 = Release|Win32
+ Release_Broadway|Win32 = Release_Broadway|Win32
Release|x64 = Release|x64
+ Release_Broadway|x64 = Release_Broadway|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -64,6 +80,14 @@ Global
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.Build.0 = Release|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.ActiveCfg = Release|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.Build.0 = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
@@ -72,6 +96,14 @@ Global
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -80,6 +112,14 @@ Global
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug_Broadway|x64.Build.0 = Debug|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|Win32.Build.0 = Release|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|x64.ActiveCfg = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|x64.Build.0 = Release|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
@@ -88,6 +128,14 @@ Global
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
@@ -96,6 +144,14 @@ Global
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug_Broadway|x64.Build.0 = Debug|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release_Broadway|Win32.Build.0 = Release|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release_Broadway|x64.ActiveCfg = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release_Broadway|x64.Build.0 = Release|x64
{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
@@ -104,6 +160,14 @@ Global
{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+ {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.ActiveCfg = Debug|Win32
{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.Build.0 = Debug|Win32
{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.ActiveCfg = Debug|x64
@@ -112,6 +176,14 @@ Global
{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.Build.0 = Release|Win32
{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.ActiveCfg = Release|x64
{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.Build.0 = Release|x64
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug_Broadway|x64.Build.0 = Debug|x64
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release_Broadway|Win32.Build.0 = Release|Win32
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release_Broadway|x64.ActiveCfg = Release|x64
+ {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release_Broadway|x64.Build.0 = Release|x64
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.ActiveCfg = Debug|Win32
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.Build.0 = Debug|Win32
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.ActiveCfg = Debug|x64
@@ -120,10 +192,38 @@ Global
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.Build.0 = Release|Win32
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.ActiveCfg = Release|x64
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.Build.0 = Release|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug_Broadway|x64.Build.0 = Debug|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|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
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+ {3281202A-CD26-4C67-B892-EB34BDBC6130}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/gtk-build-defines.vsprops b/build/win32/vs9/gtk-build-defines.vsprops
new file mode 100644
index 0000000..d365591
--- /dev/null
+++ b/build/win32/vs9/gtk-build-defines.vsprops
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkbuilddefinesprops"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
+ InheritedPropertySheets=".\gtk-version-paths.vsprops"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
+ ForcedIncludeFiles="msvc_recommended_pragmas.h"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib
cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+ AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+ />
+ <UserMacro
+ Name="GtkBinaryVersion"
+ Value="3.0.0"
+ />
+ <UserMacro
+ Name="GtkDummyPrefix"
+ Value="/dummy"
+ />
+ <UserMacro
+ Name="GtkPrefixDefine"
+ Value="GTK_PREFIX=\"$(GtkDummyPrefix)\""
+ />
+ <UserMacro
+ Name="GdkDefines"
+ Value="GDK_COMPILATION;G_LOG_DOMAIN=\"Gdk\""
+ />
+ <UserMacro
+ Name="GtkIncludedImmodulesDefines"
+
Value="INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr"
+ />
+ <UserMacro
+ Name="GtkDefines"
+
Value="GTK_COMPILATION;G_LOG_DOMAIN=\"Gtk\";GTK_HOST=\"i686-pc-vs$(VSVer)\";GTK_PRINT_BACKENDS=\"file\";GTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\";$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\"$(GtkDummyPrefix)/lib\";GTK_DATADIR=\"$(GtkDummyPrefix)/share\"GTK_DATA_PREFIX=\"$(GtkDummyPrefix)\";GTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\";MULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\";MULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\";GTK_VERSION=\"$(GtkVersion)/etc\";GTK_BINARY_VERSION=\"$(GtkBinaryVersion)/etc\";GDK_DISABLE_DEPRECATED"
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/gtk-gengir.vsprops b/build/win32/vs9/gtk-gengir.vsprops
new file mode 100644
index 0000000..ead20e0
--- /dev/null
+++ b/build/win32/vs9/gtk-gengir.vsprops
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkinstallbinprops"
+ InheritedPropertySheets=".\gtk-version-paths.vsprops"
+ >
+ <UserMacro
+ Name="DoGenGir"
+ Value="
+set VSVER=$(VSVer)

+set CONF=$(ConfigurationName)

+set PLAT=$(PlatformName)

+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)

+cd ..

+
+call gengir_gtk.bat

+cd vs$(VSVer)

+ "
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/gtk-ignore-broadway.vsprops b/build/win32/vs9/gtk-ignore-broadway.vsprops
new file mode 100644
index 0000000..01bd89c
--- /dev/null
+++ b/build/win32/vs9/gtk-ignore-broadway.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkignorebroadwayprops"
+ >
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="$(OutDir)\gdk-win32.lib"
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/gtk-install-bin.vsprops b/build/win32/vs9/gtk-install-bin.vsprops
new file mode 100644
index 0000000..08ede66
--- /dev/null
+++ b/build/win32/vs9/gtk-install-bin.vsprops
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkinstallbinprops"
+ InheritedPropertySheets=".\gtk-version-paths.vsprops"
+ >
+ <UserMacro
+ Name="GtkDoInstallBin"
+ Value="
+mkdir $(CopyDir)\bin

+mkdir $(CopyDir)\lib

+
+if exist ..\..\..\MSVC_Release_Broadway goto DO_BROADWAY_BIN

+if exist ..\..\..\MSVC_Debug_Broadway goto DO_BROADWAY_BIN

+
+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

+goto DONE_BIN

+
+:DO_BROADWAY_BIN

+copy $(ConfigurationName)\$(PlatformName)\bin\gdk-3-vs*.dll $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin

+
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.dll
$(CopyDir)\bin

+if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.exe
$(CopyDir)\bin

+
+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.dll
$(CopyDir)\bin

+if "$(ConfigurationName)" == "Debug_Broadway" copy
.\Debug\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.exe
$(CopyDir)\bin

+:DONE_BIN

+ "
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/gtk+.vsprops b/build/win32/vs9/gtk-install-headers-data.vsprops
similarity index 86%
rename from build/win32/vs9/gtk+.vsprops
rename to build/win32/vs9/gtk-install-headers-data.vsprops
index 8844d80..2895c5e 100644
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk-install-headers-data.vsprops
@@ -2,85 +2,13 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtk+props"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
+ Name="gtkinstallheadersdataprops"
+ InheritedPropertySheets=".\gtk-version-paths.vsprops"
>
- <Tool
- Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
-
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
- ForcedIncludeFiles="msvc_recommended_pragmas.h"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib
cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
- AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
- />
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="
-if exist ..\..\..\config.h goto DONE_CONFIG_H

-copy ..\..\..\config.h.win32 ..\..\..\config.h

-:DONE_CONFIG_H

-
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h

-"
- />
- <UserMacro
- Name="VSVer"
- Value="9"
- />
- <UserMacro
- Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
- />
- <UserMacro
- Name="GlibEtcInstallRootFromBuildWin32"
- Value="..\..\..\vs$(VSVer)\$(PlatformName)"
- />
- <UserMacro
- Name="CopyDir"
- Value="$(GlibEtcInstallRoot)"
- />
- <UserMacro
- Name="ApiVersion"
- Value="3.0"
- />
- <UserMacro
- Name="GtkBinaryVersion"
- Value="3.0.0"
- />
- <UserMacro
- Name="GtkDummyPrefix"
- Value="/dummy"
- />
- <UserMacro
- Name="GtkPrefixDefine"
- Value="GTK_PREFIX=\"$(GtkDummyPrefix)\""
- />
- <UserMacro
- Name="GdkDefines"
- Value="GDK_COMPILATION;G_LOG_DOMAIN=\"Gdk\""
- />
- <UserMacro
- Name="GtkIncludedImmodulesDefines"
-
Value="INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr"
- />
- <UserMacro
- Name="GtkDefines"
-
Value="GTK_COMPILATION;G_LOG_DOMAIN=\"Gtk\";GTK_HOST=\"i686-pc-vs$(VSVer)\";GTK_PRINT_BACKENDS=\"file\";GTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\";$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\"$(GtkDummyPrefix)/lib\";GTK_DATADIR=\"$(GtkDummyPrefix)/share\"GTK_DATA_PREFIX=\"$(GtkDummyPrefix)\";GTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\";MULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\";MULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\";GTK_VERSION=\"$(GtkVersion)/etc\";GTK_BINARY_VERSION=\"$(GtkBinaryVersion)/etc\";GDK_DISABLE_DEPRECATED"
- />
<UserMacro
Name="GtkDoInstall"
Value="
-echo on

-mkdir $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

-
-mkdir $(CopyDir)\lib

-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

+echo off

mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk

copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

@@ -420,9 +348,7 @@ copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(ApiVersion)\lib
copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

-copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk

-
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

mkdir $(CopyDir)\share\glib-2.0\schemas

copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

@@ -434,42 +360,14 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
&
"
/>
<UserMacro
- Name="DoGenGir"
+ Name="GtkDoInstallBroadwayHeaders"
Value="
-set VSVER=$(VSVer)

-set CONF=$(ConfigurationName)

-set PLAT=$(PlatformName)

-set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)

-cd ..

+copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-call gengir_gtk.bat

-cd vs$(VSVer)

+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway

+copy ..\..\..\gdk\broadway\gdkbroadwaywindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway

+copy ..\..\..\gdk\broadway\gdkbroadwaycursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway

+copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway

"
/>
- <UserMacro
- Name="GtkLibtoolCompatibleDllPrefix"
- Value="lib"
- />
- <UserMacro
- Name="GtkLibtoolCompatibleDllSuffix"
- Value="-$(ApiVersion)-0"
- />
- <UserMacro
- Name="GtkSeparateVSDllPrefix"
- Value=""
- />
- <UserMacro
- Name="GtkSeparateVSDllSuffix"
- Value="-3-vs$(VSVer)"
- />
- <!-- Change these two to GtkLibtoolCompatibleDllPrefix and
- GtkLibtoolCompatibleDllSuffix if that is what you want -->
- <UserMacro
- Name="GtkDllPrefix"
- Value="$(GtkSeparateVSDllPrefix)"
- />
- <UserMacro
- Name="GtkDllSuffix"
- Value="$(GtkSeparateVSDllSuffix)"
- />
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk-version-paths.vsprops b/build/win32/vs9/gtk-version-paths.vsprops
new file mode 100644
index 0000000..7a97b18
--- /dev/null
+++ b/build/win32/vs9/gtk-version-paths.vsprops
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkversionpathsprops"
+ >
+ <UserMacro
+ Name="VSVer"
+ Value="9"
+ />
+ <UserMacro
+ Name="GlibEtcInstallRoot"
+ Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="GlibEtcInstallRootFromBuildWin32"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="CopyDir"
+ Value="$(GlibEtcInstallRoot)"
+ />
+ <UserMacro
+ Name="ApiVersion"
+ Value="3.0"
+ />
+ <UserMacro
+ Name="GtkLibtoolCompatibleDllPrefix"
+ Value="lib"
+ />
+ <UserMacro
+ Name="GtkLibtoolCompatibleDllSuffix"
+ Value="-$(ApiVersion)-0"
+ />
+ <UserMacro
+ Name="GtkSeparateVSDllPrefix"
+ Value=""
+ />
+ <UserMacro
+ Name="GtkSeparateVSDllSuffix"
+ Value="-3-vs$(VSVer)"
+ />
+ <!-- Change these two to GtkLibtoolCompatibleDllPrefix and
+ GtkLibtoolCompatibleDllSuffix if that is what you want -->
+ <UserMacro
+ Name="GtkDllPrefix"
+ Value="$(GtkSeparateVSDllPrefix)"
+ />
+ <UserMacro
+ Name="GtkDllSuffix"
+ Value="$(GtkSeparateVSDllSuffix)"
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index b3066b0..5ff0484 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -53,7 +53,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -85,7 +85,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -117,7 +117,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gtk3-demo-application.vcproj b/build/win32/vs9/gtk3-demo-application.vcproj
index 51b90ea..84254b8 100644
--- a/build/win32/vs9/gtk3-demo-application.vcproj
+++ b/build/win32/vs9/gtk3-demo-application.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -49,7 +49,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="0"
@@ -80,7 +80,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -109,7 +109,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="0"
diff --git a/build/win32/vs9/gtk3-demo.vcproj b/build/win32/vs9/gtk3-demo.vcproj
index e5325fa..3542092 100644
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -22,7 +22,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -55,7 +55,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="0"
>
@@ -121,7 +121,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="0"
>
diff --git a/build/win32/vs9/gtka11y.vcprojin b/build/win32/vs9/gtka11y.vcprojin
index 1943de1..6883f7a 100644
--- a/build/win32/vs9/gtka11y.vcprojin
+++ b/build/win32/vs9/gtka11y.vcprojin
@@ -21,7 +21,29 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+ AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -43,7 +65,29 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+ AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -65,7 +109,30 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(GtkDefines)"
+ AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|Win32"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -88,7 +155,27 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtkprebuild.vsprops"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(GtkDefines)"
+ AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|x64"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gtkprebuild-broadway.vsprops b/build/win32/vs9/gtkprebuild-broadway.vsprops
new file mode 100644
index 0000000..9284ae1
--- /dev/null
+++ b/build/win32/vs9/gtkprebuild-broadway.vsprops
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkprebuild_broadwayprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="
+if exist ..\..\..\config.h goto DONE_CONFIG_H

+copy ..\..\..\config.h.win32 ..\..\..\config.h

+:DONE_CONFIG_H

+
+if exist ..\..\..\MSVC_$(ConfigurationName) goto DONE_GDKCONFIG_H

+if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h

+if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD

+if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release

+if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug

+if "$(ConfigurationName)" == "Release_Broadway" del
..\..\..\MSVC_Debug_Broadway

+if "$(ConfigurationName)" == "Debug_Broadway" del
..\..\..\MSVC_Release_Broadway

+copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h

+copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD

+echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)

+:DONE_GDKCONFIG_H

+"
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/gtkprebuild.vsprops b/build/win32/vs9/gtkprebuild.vsprops
new file mode 100644
index 0000000..1b23eff
--- /dev/null
+++ b/build/win32/vs9/gtkprebuild.vsprops
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkprebuildprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="
+if exist ..\..\..\config.h goto DONE_CONFIG_H

+copy ..\..\..\config.h.win32 ..\..\..\config.h

+:DONE_CONFIG_H

+
+if exist ..\..\..\MSVC_$(ConfigurationName) goto DONE_GDKCONFIG_H

+if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h

+if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD

+if exist ..\..\..\MSVC_Release_Broadway del ..\..\..\MSVC_Release_Broadway

+if exist ..\..\..\MSVC_Debug_Broadway del ..\..\..\MSVC_Debug_Broadway

+if "$(ConfigurationName)" == "Release" del ..\..\..\MSVC_Debug

+if "$(ConfigurationName)" == "Debug" del ..\..\..\MSVC_Release

+copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h

+copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD

+echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)

+:DONE_GDKCONFIG_H

+"
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 3cc6b83..e7960c9 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -21,58 +21,192 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
-
-ConfigurationType="10"
+ ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(GtkDoInstall)"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(GtkDoInstall)"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|Win32"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+ CharacterSet="2"
+ DeleteExtensionsOnClean=""
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_Broadway|x64"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+ CharacterSet="2"
+ DeleteExtensionsOnClean=""
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk+.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
CharacterSet="2"
- WholeProgramOptimization="1"
DeleteExtensionsOnClean=""
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(GtkDoInstall)"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk+.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+ CharacterSet="2"
+ DeleteExtensionsOnClean=""
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|Win32"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
CharacterSet="2"
+ DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Broadway|x64"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ ConfigurationType="10"
+ InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+ CharacterSet="2"
DeleteExtensionsOnClean=""
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(GtkDoInstall)"
+ CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
+ <References>
+ </References>
+ <Files>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 7cdae7d..8cba7c0 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST += \
gdkkeynames.c \
gen-keyname-table.pl \
gdkconfig.h.win32 \
+ gdkconfig.h.win32_broadway \
gdkkeysyms-update.pl \
gdkmarshalers.list \
gdkwindowimpl.h \
diff --git a/gdk/gdkconfig.h.win32_broadway b/gdk/gdkconfig.h.win32_broadway
new file mode 100644
index 0000000..f5021f9
--- /dev/null
+++ b/gdk/gdkconfig.h.win32_broadway
@@ -0,0 +1,23 @@
+/* gdkconfig.h
+ *
+ * This is a generated file. Please modify `configure.ac'
+ */
+
+#ifndef __GDKCONFIG_H__
+#define __GDKCONFIG_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+
+#define GDK_WINDOWING_WIN32
+#define GDK_WINDOWING_BROADWAY
+
+G_END_DECLS
+
+#endif /* __GDKCONFIG_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
