[gtkmm] Add missing include paths to MSVC property sheets
- From: Armin Burgmeier <arminb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Add missing include paths to MSVC property sheets
- Date: Wed, 4 Aug 2010 18:17:00 +0000 (UTC)
commit a3954cd1a2f34d1a467a82e9a8fa0d53d1c6bb26
Author: Armin Burgmeier <armin arbur net>
Date: Wed Aug 4 19:20:31 2010 +0200
Add missing include paths to MSVC property sheets
2010-08-04 Armin Burgmeier <armin arbur net>
Add missing include paths to MSVC property sheets.
* win32_installer/gtkmm-vc80-2_4.vsprops:
* win32_installer/gtkmm-vc80-d-2_4.vsprops:
* win32_installer/gtkmm-vc90-2_4.vsprops:
* win32_installer/gtkmm-vc90-d-2_4.vsprops: Add lib/pangomm-1.4/include
and include/freetype2 to inculde paths.
* win32_installer/install-msvc-module: Update for gtkmm 2.20.3.
ChangeLog | 12 ++++++++++++
win32_installer/gtkmm-vc80-2_4.vsprops | 2 +-
win32_installer/gtkmm-vc80-d-2_4.vsprops | 2 +-
win32_installer/gtkmm-vc90-2_4.vsprops | 2 +-
win32_installer/gtkmm-vc90-d-2_4.vsprops | 2 +-
win32_installer/install-msvc-module | 6 +++---
6 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 728a040..1494803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2010-08-04 Armin Burgmeier <armin arbur net>
+ Add missing include paths to MSVC property sheets.
+
+ * win32_installer/gtkmm-vc80-2_4.vsprops:
+ * win32_installer/gtkmm-vc80-d-2_4.vsprops:
+ * win32_installer/gtkmm-vc90-2_4.vsprops:
+ * win32_installer/gtkmm-vc90-d-2_4.vsprops: Add lib/pangomm-1.4/include
+ and include/freetype2 to inculde paths.
+
+ * win32_installer/install-msvc-module: Update for gtkmm 2.20.3.
+
+2010-08-04 Armin Burgmeier <armin arbur net>
+
Fixed using stock items with MSVC. Bug #625489.
* gtk/gtkmmconfig.h.in: Make sure we define GTKMM_API to
diff --git a/win32_installer/gtkmm-vc80-2_4.vsprops b/win32_installer/gtkmm-vc80-2_4.vsprops
index 2bcb4b4..b158a44 100644
--- a/win32_installer/gtkmm-vc80-2_4.vsprops
+++ b/win32_installer/gtkmm-vc80-2_4.vsprops
@@ -7,7 +7,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
- AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\libglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\i
nclude";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include""
+ AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\lib\pangomm-1.4\include";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\li
bglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\include";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\freetype2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include""
DisableSpecificWarnings="4250;4312"
/>
<Tool
diff --git a/win32_installer/gtkmm-vc80-d-2_4.vsprops b/win32_installer/gtkmm-vc80-d-2_4.vsprops
index 536c856..2ecf188 100644
--- a/win32_installer/gtkmm-vc80-d-2_4.vsprops
+++ b/win32_installer/gtkmm-vc80-d-2_4.vsprops
@@ -7,7 +7,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
- AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\libglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\i
nclude";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include""
+ AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\lib\pangomm-1.4\include";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\li
bglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\include";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include\freetype2";"$(GTKMM_BASEPATH)\include""
DisableSpecificWarnings="4250;4312"
/>
<Tool
diff --git a/win32_installer/gtkmm-vc90-2_4.vsprops b/win32_installer/gtkmm-vc90-2_4.vsprops
index 9749aed..17eef38 100644
--- a/win32_installer/gtkmm-vc90-2_4.vsprops
+++ b/win32_installer/gtkmm-vc90-2_4.vsprops
@@ -7,7 +7,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
- AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\libglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\i
nclude";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include""
+ AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\lib\pangomm-1.4\include";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\li
bglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\include";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include\freetype2";"$(GTKMM_BASEPATH)\include""
DisableSpecificWarnings="4250"
/>
<Tool
diff --git a/win32_installer/gtkmm-vc90-d-2_4.vsprops b/win32_installer/gtkmm-vc90-d-2_4.vsprops
index f009433..5df3b80 100644
--- a/win32_installer/gtkmm-vc90-d-2_4.vsprops
+++ b/win32_installer/gtkmm-vc90-d-2_4.vsprops
@@ -7,7 +7,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
- AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\libglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\i
nclude";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include""
+ AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\lib\pangomm-1.4\include";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\li
bglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\include";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include\freetype2";"$(GTKMM_BASEPATH)\include""
DisableSpecificWarnings="4250"
/>
<Tool
diff --git a/win32_installer/install-msvc-module b/win32_installer/install-msvc-module
index c6f0060..69db7bd 100644
--- a/win32_installer/install-msvc-module
+++ b/win32_installer/install-msvc-module
@@ -52,21 +52,21 @@ case $module in
subdir='pangomm'
;;
atkmm)
- sourcepath="${basepath}/gtkmm-2.20.0"
+ sourcepath="${basepath}/gtkmm-2.20.3"
basename='atkmm'
vername='1_6'
abiname='atkmm-1.6'
subdir='atkmm'
;;
gdkmm)
- sourcepath="${basepath}/gtkmm-2.20.0"
+ sourcepath="${basepath}/gtkmm-2.20.3"
basename='gdkmm'
vername='2_4'
abiname='gdkmm-2.4'
subdir='gdkmm'
;;
gtkmm)
- sourcepath="${basepath}/gtkmm-2.20.0"
+ sourcepath="${basepath}/gtkmm-2.20.3"
basename='gtkmm'
vername='2_4'
abiname='gtkmm-2.4'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
