[gtk+/gtk-2-24] Bug 687575: Update Visual C++ 2008 projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] Bug 687575: Update Visual C++ 2008 projects
- Date: Wed, 5 Dec 2012 15:54:10 +0000 (UTC)
commit a4411079794ccd377ae73b6693924a0d96dafc94
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Dec 5 23:52:55 2012 +0800
Bug 687575: Update Visual C++ 2008 projects
The Visual C++ project files for GTK+-2.24.x need to be updated as the
Windows theme engine (libwimp) currently has to be built as a DLL.
This adds the Visual C++ 2008 project file to build libwimp as a standalone
module/DLL, and the property sheets, .sln file and gtk.vcprojin are updated
accordingly so that the needed stuff get built properly and go to the
proper places for the Windows Themes to work correctly with the Visual C++
builds.
Thanks to nus for pointing this out. Visual C++ 2010 projects files will
be updated in the next 1-2 days.
build/win32/vs9/Makefile.am | 1 +
build/win32/vs9/gtk+.sln | 15 ++++
build/win32/vs9/gtk+.vsprops | 43 +++++++---
build/win32/vs9/gtk.vcprojin | 4 -
build/win32/vs9/libwimp.vcproj | 173 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 218 insertions(+), 18 deletions(-)
---
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 391d5c8..5234db4 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -11,4 +11,5 @@ EXTRA_DIST += \
gtk.vcprojin \
gtk-demo.vcproj \
gailutil.vcproj \
+ libwimp.vcproj \
install.vcproj
diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln
index 4a24f0c..5a07fb9 100644
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -24,6 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF} = {B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F} = {7660FB4E-2AE6-483E-8813-0974CBE6F97F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}"
@@ -32,6 +33,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwimp", "libwimp.vcproj", "{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -88,6 +95,14 @@ Global
{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.Build.0 = Release|Win32
{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.ActiveCfg = Release|x64
{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.Build.0 = Release|x64
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.Build.0 = Debug|Win32
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.ActiveCfg = Debug|x64
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.Build.0 = Debug|x64
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.ActiveCfg = Release|Win32
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.Build.0 = Release|Win32
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.ActiveCfg = Release|x64
+ {7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/gtk+.vsprops b/build/win32/vs9/gtk+.vsprops
index d933ce4..6687457 100644
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -42,37 +42,29 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h

Value="/dummy"
/>
<UserMacro
- Name="GtkPrefixDefine"
- Value="GTK_PREFIX=\"$(GtkDummyPrefix)\""
- />
- <UserMacro
Name="GdkDefines"
Value="GDK_COMPILATION;G_LOG_DOMAIN=\"Gdk\""
/>
<UserMacro
+ Name="GtkHost"
+ Value="i686-pc-vs9"
+ />
+ <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-vs9\";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-$(GtkApiVersion)\";MULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\";GTK_VERSION=\"$(GtkVersion)/etc\";GTK_BINARY_VERSION=\"$(GtkBinaryVersion)/etc\""
+ Value="GTK_COMPILATION;G_LOG_DOMAIN=\"Gtk\";GTK_HOST=\"$(GtkHost)\";GTK_PRINT_BACKENDS=\"file\";GTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\";$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\"$(GtkDummyPrefix)/lib\";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\";MULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\";GTK_VERSION=\"$(GtkVersion)\";GTK_BINARY_VERSION=\"$(GtkBinaryVersion)\""
/>
<UserMacro
Name="GtkDoInstall"
Value="
echo on

mkdir $(OutDir)\bin

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

+copy $(ConfigurationName)\$(PlatformName)\bin\*-vs9.dll $(OutDir)\bin

copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin

-mkdir $(OutDir)\share\gtk-$(GtkApiVersion)\demo

-copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\share\gtk-$(GtkApiVersion)\demo

-copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\share\gtk-$(GtkApiVersion)\demo

-copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\share\gtk-$(GtkApiVersion)\demo

-copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\share\gtk-$(GtkApiVersion)\demo

-copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\share\gtk-$(GtkApiVersion)\demo

-copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\share\gtk-$(GtkApiVersion)\demo

-
mkdir $(OutDir)\lib

copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib

@@ -337,6 +329,29 @@ copy ..\..\..\modules\other\gail\libgail-util\gailtextutil.h $(OutDir)\include\g
copy ..\..\..\modules\other\gail\libgail-util\gail-util.h $(OutDir)\include\gail-1.0\libgail-util

copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib

+
+mkdir $(Outdir)\lib\gtk-$(GtkApiVersion)\$(GtkHost)\engines

+copy $(ConfigurationName)\$(PlatformName)\bin\libwimp.dll $(Outdir)\lib\gtk-$(GtkApiVersion)\$(GtkHost)\engines

+
+mkdir $(OutDir)\share\gtk-$(GtkApiVersion)\demo

+copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\share\gtk-$(GtkApiVersion)\demo

+copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\share\gtk-$(GtkApiVersion)\demo

+copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\share\gtk-$(GtkApiVersion)\demo

+copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\share\gtk-$(GtkApiVersion)\demo

+copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\share\gtk-$(GtkApiVersion)\demo

+copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\share\gtk-$(GtkApiVersion)\demo

+
+mkdir $(OutDir)\share\themes\Default\gtk-2.0-key

+copy ..\..\..\gtk\gtkrc.key.default $(OutDir)\share\themes\Default\gtk-2.0-key\gtkrc

+
+mkdir $(OutDir)\share\themes\Emacs\gtk-2.0-key

+copy ..\..\..\gtk\gtkrc.key.emacs $(OutDir)\share\themes\Emacs\gtk-2.0-key\gtkrc

+
+mkdir $(OutDir)\share\themes\MS-Windows\gtk-2.0

+copy ..\..\..\modules\engines\ms-windows\Theme\gtk-2.0\gtkrc $(OutDir)\share\themes\MS-Windows\gtk-2.0

+
+mkdir $(OutDir)\share\themes\Raleigh\gtk-2.0

+copy ..\..\..\gtk\gtkrc.default $(OutDir)\share\themes\Raleigh\gtk-2.0\gtkrc

"
/>
<UserMacro
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index b9a889e..0864763 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -231,10 +231,6 @@
<File RelativePath="..\..\..\modules\input\imti-et.c" />
<File RelativePath="..\..\..\modules\input\imviqr.c" />
<File RelativePath="..\..\..\modules\input\thai-charprop.c" />
- <File RelativePath="..\..\..\modules\engines\ms-windows\msw_rc_style.c" />
- <File RelativePath="..\..\..\modules\engines\ms-windows\msw_style.c" />
- <File RelativePath="..\..\..\modules\engines\ms-windows\msw_theme_main.c" />
- <File RelativePath="..\..\..\modules\engines\ms-windows\xp_theme.c" />
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/libwimp.vcproj b/build/win32/vs9/libwimp.vcproj
new file mode 100644
index 0000000..3eba869
--- /dev/null
+++ b/build/win32/vs9/libwimp.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libwimp"
+ ProjectGUID="{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+ RootNamespace="libwimp"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\gtk+.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\gtk+.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions=""
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ InheritedPropertySheets=".\gtk+.vsprops"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ InheritedPropertySheets=".\gtk+.vsprops"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ PreprocessorDefinitions=""
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ 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}"
+ >
+ <File RelativePath="..\..\..\modules\engines\ms-windows\msw_rc_style.c" />
+ <File RelativePath="..\..\..\modules\engines\ms-windows\msw_style.c" />
+ <File RelativePath="..\..\..\modules\engines\ms-windows\msw_theme_main.c" />
+ <File RelativePath="..\..\..\modules\engines\ms-windows\xp_theme.c" />
+ </Filter>
+ <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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
