gtkmm r1119 - in trunk: . MSVC_Net2005/gtkmm MSVC_Net2008/gtkmm win32_installer
- From: arminb svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkmm r1119 - in trunk: . MSVC_Net2005/gtkmm MSVC_Net2008/gtkmm win32_installer
- Date: Tue, 17 Mar 2009 20:43:29 +0000 (UTC)
Author: arminb
Date: Tue Mar 17 20:43:28 2009
New Revision: 1119
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1119&view=rev
Log:
2009-03-17 Armin Burgmeier <armin openismus com>
* MSVC_Net2005/gtkmm/gtkmm.vcproj:
* MSVC_Net2008/gtkmm/gtkmm.vcproj: Added activatable.[h|cc] and
orientable.[h|cc] to the project.
* win32_installer/gtkmm-vc80-2_4.vsprops:
* win32_installer/gtkmm-vc80-d-2_4.vsprops: Disable warning 4312,
since a glib 2.20 header file triggers it, and this clutters the
compiler output otherwise.
* win32_installer/README:
* win32_installer/build-installer:
* win32_installer/gtkmm-installer.nsi.in:
* win32_installer/install-msvc-module:
* win32_installer/Makefile.am:
* win32_installer/redist_README.txt: Adapt for gtkmm 2.16. Added a
redist/ folder to the installer which contains optimized and stripped
binaries, and removed the option to set the PATH environment variable.
We set it always now as it is required for running built applications.
Added:
trunk/win32_installer/redist_README.txt
Modified:
trunk/ChangeLog
trunk/MSVC_Net2005/gtkmm/gtkmm.vcproj
trunk/MSVC_Net2008/gtkmm/gtkmm.vcproj
trunk/win32_installer/Makefile.am
trunk/win32_installer/README
trunk/win32_installer/build-installer
trunk/win32_installer/gtkmm-installer.nsi.in
trunk/win32_installer/gtkmm-vc80-2_4.vsprops
trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops
trunk/win32_installer/install-msvc-module
Modified: trunk/MSVC_Net2005/gtkmm/gtkmm.vcproj
==============================================================================
--- trunk/MSVC_Net2005/gtkmm/gtkmm.vcproj (original)
+++ trunk/MSVC_Net2005/gtkmm/gtkmm.vcproj Tue Mar 17 20:43:28 2009
@@ -212,6 +212,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\activatable.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\adjustment.cc"
>
</File>
@@ -540,6 +544,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\orientable.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\pagesetup.cc"
>
</File>
@@ -918,6 +926,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\activatable.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\adjustment.h"
>
</File>
@@ -1250,6 +1262,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\orientable.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\pagesetup.h"
>
</File>
Modified: trunk/MSVC_Net2008/gtkmm/gtkmm.vcproj
==============================================================================
--- trunk/MSVC_Net2008/gtkmm/gtkmm.vcproj (original)
+++ trunk/MSVC_Net2008/gtkmm/gtkmm.vcproj Tue Mar 17 20:43:28 2009
@@ -211,6 +211,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\activatable.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\adjustment.cc"
>
</File>
@@ -539,6 +543,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\orientable.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\pagesetup.cc"
>
</File>
@@ -917,6 +925,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\activatable.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\adjustment.h"
>
</File>
@@ -1249,6 +1261,10 @@
>
</File>
<File
+ RelativePath="..\..\gtk\gtkmm\orientable.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gtk\gtkmm\pagesetup.h"
>
</File>
Modified: trunk/win32_installer/Makefile.am
==============================================================================
--- trunk/win32_installer/Makefile.am (original)
+++ trunk/win32_installer/Makefile.am Tue Mar 17 20:43:28 2009
@@ -5,7 +5,7 @@
MAINTAINERCLEANFILES = $(built_sources)
DISTCLEANFILES = $(built_sources)
-EXTRA_DIST = lgpl.txt gtkmm.ico gtkmm_win32.txt README \
+EXTRA_DIST = lgpl.txt gtkmm.ico gtkmm_win32.txt redist_README.txt README \
gtkmm-vc80-2_4.vsprops gtkmm-vc80-d-2_4.vsprops \
gtkmm-vc90-2_4.vsprops gtkmm-vc90-d-2_4.vsprops \
install-msvc-module build-installer
Modified: trunk/win32_installer/README
==============================================================================
--- trunk/win32_installer/README (original)
+++ trunk/win32_installer/README Tue Mar 17 20:43:28 2009
@@ -1,9 +1,15 @@
To create the installer, first build all libraries with both mingw (with
documentation enabled, you will need doxygen and graphviz for this) and MSVC
-(both Debug and Release). 'make install' the mingw-built ones.
+(both Debug and Release). 'make install' non-optimized debug mingw-built ones
+to the /gtkmm_debug prefix, and the optimized non-debug mingw-built ones to
+the /gtkmm_release prefix.
+
+Build gtkmm-documentation on a linux machine, install it into a temporary
+prefix and move $prefix/share to /gtkmm_debug/share in MSYS. I have not yet
+succeeded in building gtkmm-documentation on Windows directly.
Then, run the build-installer script. You might need to adjust some paths
in the install-msvc-module script. I hope to generalize the script to
always find the correct paths in the near future.
-Armin Burgmeier, 2008-08-10
+Armin Burgmeier, 2009-03-17
Modified: trunk/win32_installer/build-installer
==============================================================================
--- trunk/win32_installer/build-installer (original)
+++ trunk/win32_installer/build-installer Tue Mar 17 20:43:28 2009
@@ -2,21 +2,18 @@
echo "This builds the development and runtime installers for gtkmm. Make "
echo "sure to have everything (libsigc++, glibmm, cairomm, pangomm, gtkmm, "
-echo "libglademm, libxml++) installed to /usr/local, and to have "
-echo "successfully built everything with both MSVC 2005 and MSVC 2008 (both "
-echo "Debug and Release builds). Make also sure that the official GTK+ "
-echo "bundle has been unzipped to echo /bundle, as well as libxml2 and iconv "
-echo "runtime and development files. Finally, make sure that makensis is in "
-echo "your PATH"
-
-# Copy all of /usr/local into here. It's probably more than we need, but we
-# can be sure we have the required stuff this way.
-# TODO: Maybe it would be enough to create Windows Shortcuts here.
+echo "libglademm, libxml++) installed to /gtkmm_debug and /gtkmm_release, "
+echo "respectively and to have successfully built everything with both "
+echo "MSVC 2005 and MSVC 2008 (both Debug and Release builds). Make also "
+echo "sure that the official GTK+ bundle has been unzipped to /bundle, as "
+echo "well as libxml2 and iconv runtime and development files. Install "
+echo "libglade into /libglade. Finally, make sure that makensis is in your PATH"
+
echo "Copying mingw files..."
-cp -R /usr/local/bin . || exit -1
-cp -R /usr/local/lib . || exit -1
-cp -R /usr/local/share . || exit -1
-cp -R /usr/local/include . || exit -1
+cp -R /gtkmm_debug/bin . || exit -1
+cp -R /gtkmm_debug/lib . || exit -1
+cp -R /gtkmm_debug/share . || exit -1
+cp -R /gtkmm_debug/include . || exit -1
# Same with /bundle, for GTK+
cp -R /bundle/bin . || exit -1
@@ -26,6 +23,12 @@
cp -R /bundle/etc . || exit -1
cp -R /bundle/contrib . || exit -1
+# libglade
+cp -R /libglade/bin . || exit -1
+cp -R /libglade/include . || exit -1
+cp -R /libglade/lib . || exit -1
+cp -R /libglade/share . || exit -1
+
# The license text in the installer
cp ../COPYING lgpl.txt
@@ -59,10 +62,13 @@
echo "Stripping binaries..."
mkdir -p bin_stripped || exit -1
cp -R bin/* bin_stripped || exit -1
+# Use the gtkmm release binaries (they have been compiled with -O2 instead of -O0)
+cp -R /gtkmm_release/bin* bin_stripped || exit -1
strip bin_stripped/*.dll || exit -1
-strip bin_stripped/*.exe || exit -1;
+strip bin_stripped/*.exe || exit -1
# TODO: Strip modules in lib/gtk-2.0?
+# TODO: Strip .dll.a files with --strip-unneeded
# Get the MSVC files into here
echo "Copying MSVC files..."
Modified: trunk/win32_installer/gtkmm-installer.nsi.in
==============================================================================
--- trunk/win32_installer/gtkmm-installer.nsi.in (original)
+++ trunk/win32_installer/gtkmm-installer.nsi.in Tue Mar 17 20:43:28 2009
@@ -252,10 +252,10 @@
File /r etc\pango
SetOutPath $INSTDIR\share\doc
- File /r share\doc\glib-2.18.1
- File /r share\doc\cairo_1.7.6-1_win32
- File /r share\doc\pango-1.22.0
- File /r share\doc\gtk+-2.14.3
+ File /r share\doc\glib-2.20.0
+ File /r share\doc\cairo_1.8.6-1_win32
+ File /r share\doc\pango-1.24.0
+ File /r share\doc\gtk+-2.16.0
SetOutPath $INSTDIR\share
File /r share\locale
@@ -266,6 +266,39 @@
SetOutPath $INSTDIR\contrib
File /r contrib\tiff
+!ifndef RUNTIME_ONLY
+ SetOutPath $INSTDIR\redist
+
+ ; These are broken when stripped:
+ File bin\zlib1.dll
+ File bin\intl.dll
+ File bin\charset.dll
+ File bin\iconv.dll
+ File bin\libxml2.dll
+
+ File bin_stripped\jpeg62.dll
+ File bin_stripped\libpng12-0.dll
+ File bin_stripped\libtiff3.dll
+ File bin_stripped\libglib-2.0-0.dll
+ File bin_stripped\libgobject-2.0-0.dll
+ File bin_stripped\libgmodule-2.0-0.dll
+ File bin_stripped\libgthread-2.0-0.dll
+ File bin_stripped\libgio-2.0-0.dll
+ File bin_stripped\libcairo-2.dll
+ File bin_stripped\libatk-1.0-0.dll
+ File bin_stripped\libpango-1.0-0.dll
+ File bin_stripped\libpangocairo-1.0-0.dll
+ File bin_stripped\libpangoft2-1.0-0.dll
+ File bin_stripped\libpangowin32-1.0-0.dll
+ File bin_stripped\libgailutil-18.dll
+ File bin_stripped\libgdk-win32-2.0-0.dll
+ File bin_stripped\libgdk_pixbuf-2.0-0.dll
+ File bin_stripped\libgtk-win32-2.0-0.dll
+ File bin_stripped\libglade-2.0-0.dll
+ File bin_stripped\gspawn-win32-helper.exe
+ File bin_stripped\gspawn-win32-helper-console.exe
+!endif
+
SectionEnd
!ifndef RUNTIME_ONLY
@@ -414,13 +447,16 @@
File lib\pkgconfig\libglade-2.0.pc
SetOutPath $INSTDIR\share\doc
- File /r share\doc\glib-dev-2.18.1
- File /r share\doc\pango-dev-1.22.0
- File /r share\doc\gtk+-dev-2.14.3
+ File /r share\doc\glib-dev-2.20.0
+ File /r share\doc\pango-dev-1.24.0
+ File /r share\doc\gtk+-dev-2.16.0
SetOutPath $INSTDIR\share\xml
File /r share\xml\libglade
+ SetOutPath $INSTDIR\share
+ File /r share\glib-2.0
+
SetOutPath $INSTDIR\share\aclocal
File share\aclocal\glib-2.0.m4
File share\aclocal\glib-gettext.m4
@@ -469,6 +505,9 @@
File MSVC\sigc-vc90-d-2_0.dll
File MSVC\sigc-vc80-d-2_0.pdb
File MSVC\sigc-vc90-d-2_0.pdb
+
+ SetOutPath $INSTDIR\redist
+ File bin_stripped\libsigc-2.0-0.dll
!endif
SectionEnd
@@ -526,6 +565,9 @@
File MSVC\cairomm-vc90-d-1_0.dll
File MSVC\cairomm-vc80-d-1_0.pdb
File MSVC\cairomm-vc90-d-1_0.pdb
+
+ SetOutPath $INSTDIR\redist
+ File bin_stripped\libcairomm-1.0-1.dll
!endif
SectionEnd
@@ -589,6 +631,10 @@
File MSVC\giomm-vc90-d-2_4.dll
File MSVC\giomm-vc80-d-2_4.pdb
File MSVC\giomm-vc90-d-2_4.pdb
+
+ SetOutPath $INSTDIR\redist
+ File bin_stripped\libglibmm-2.4-1.dll
+ File bin_stripped\libgiomm-2.4-1.dll
!endif
SectionEnd
@@ -660,6 +706,9 @@
File MSVC\pangomm-vc90-d-1_4.dll
File MSVC\pangomm-vc80-d-1_4.pdb
File MSVC\pangomm-vc90-d-1_4.pdb
+
+ SetOutPath $INSTDIR\redist
+ File bin_stripped\libpangomm-1.4-1.dll
!endif
SectionEnd
@@ -735,6 +784,11 @@
File MSVC\gtkmm-vc90-d-2_4.dll
File MSVC\gtkmm-vc80-d-2_4.pdb
File MSVC\gtkmm-vc90-d-2_4.pdb
+
+ SetOutPath $INSTDIR\redist
+ File bin_stripped\libatkmm-1.6-1.dll
+ File bin_stripped\libgdkmm-2.4-1.dll
+ File bin_stripped\libgtkmm-2.4-1.dll
!endif
SectionEnd
@@ -824,14 +878,14 @@
File ${BINDIR}\libglademm-2.4-1.dll
File MSVC\glademm-vc80-2_4.dll
File MSVC\glademm-vc90-2_4.dll
-; CreateShortCut "libglademm-2.4.dll.lnk" "glademm-2.4.dll"
!ifndef RUNTIME_ONLY
File MSVC\glademm-vc80-d-2_4.dll
File MSVC\glademm-vc90-d-2_4.dll
-; CreateShortCut "libglademm-2.4d.dll.lnk" "glademm-2.4d.dll"
File MSVC\glademm-vc80-d-2_4.pdb
File MSVC\glademm-vc90-d-2_4.pdb
-; CreateShortCut "libglademm-2.4d.pdb.lnk" "glademm-2.4d.pdb"
+
+ SetOutPath $INSTDIR\redist
+ File bin_stripped\libglademm-2.4-1.dll
!endif
SectionEnd
@@ -852,9 +906,6 @@
File MSVC\glademm-vc80-d-2_4.lib
File MSVC\glademm-vc90-d-2_4.lib
-; CreateShortCut "libglademm-2.4.lib.lnk" "$INSTDIR\lib\glademm-2.4.lib"
-; CreateShortCut "libglademm-2.4d.lib.lnk" "$INSTDIR\lib\glademm-2.4d.lib"
-
SetOutPath $INSTDIR\lib\pkgconfig
File lib\pkgconfig\libglademm-2.4.pc
@@ -887,14 +938,14 @@
File ${BINDIR}\libxml++-2.6-2.dll
File MSVC\xml++-vc80-2_6.dll
File MSVC\xml++-vc90-2_6.dll
-; CreateShortCut "libxml++-2.6.dll.lnk" "xml++-2.6.dll"
!ifndef RUNTIME_ONLY
File MSVC\xml++-vc80-d-2_6.dll
File MSVC\xml++-vc90-d-2_6.dll
-; CreateShortCut "libxml++-2.6d.dll.lnk" "xml++-2.6d.dll"
File MSVC\xml++-vc80-d-2_6.pdb
File MSVC\xml++-vc90-d-2_6.pdb
-; CreateShortCut "libxml++-2.6d.pdb.lnk" "xml++-2.6d.pdb"
+
+ SetOutPath $INSTDIR\redist
+ File bin_stripped\libxml++-2.6-2.dll
!endif
SectionEnd
@@ -915,9 +966,6 @@
File MSVC\xml++-vc80-d-2_6.lib
File MSVC\xml++-vc90-d-2_6.lib
-; CreateShortCut "libxml++-2.6.lib.lnk" "$INSTDIR\lib\xml++-2.6.lib"
-; CreateShortCut "libxml++-2.6d.lib.lnk" "$INSTDIR\lib\xml++-2.6.d.lib"
-
SetOutPath $INSTDIR\lib\pkgconfig
File lib\pkgconfig\libxml++-2.6.pc
@@ -985,6 +1033,10 @@
; Start Menu
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
+ SetOutPath $INSTDIR\redist
+ File /oname=README.txt "redist_README.txt"
+
+ File bin_stripped\zlib1.dll
SetOutPath $INSTDIR
File "gtkmm.ico"
File "lgpl.txt"
@@ -1104,10 +1156,12 @@
WriteUninstaller "$INSTDIR\${GTKMM_UNINSTALL_EXE}"
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\${GTKMM_UNINSTALL_EXE}"
+!ifdef RUNTIME_ONLY
; Set the PATH with gtkmm target directory (if relevant)
IfSilent +2
; Read a value from an InstallOptions INI file
!insertmacro MUI_INSTALLOPTIONS_READ $CB_PATH_VALUE "PathQuestion.ini" "Field 1" "State"
+!endif ; RUNTIME_ONLY
StrCmp $CB_PATH_VALUE "1" "" done
Push $CONTEXT
Push "$INSTDIR\bin"
@@ -1199,7 +1253,6 @@
ReadRegStr $R0 HKCU "Software\GTK\2.0" "PATH"
; Remove gtkmm from PATH
-
StrCmp $R0 $INSTDIR +4
Push $CONTEXT
Push "$INSTDIR\bin"
@@ -1743,19 +1796,15 @@
Function CustomPagePathQuestion
ClearErrors
- ReadRegStr $R0 HKLM "Software\GTK\2.0" "PATH"
- IfErrors 0 +2
- ReadRegStr $R0 HKCU "Software\GTK\2.0" "PATH"
- StrCmp $R0 $INSTDIR path_ok
- !insertmacro MUI_HEADER_TEXT "$(MISC_INSTALL_OPTION)" "$(MISC_ANSWER_SYSTEM)"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "PathQuestion.ini" "Field 1" "Text" "$(GTKMM_ADD_PATH)"
- !insertmacro MUI_INSTALLOPTIONS_DISPLAY "PathQuestion.ini"
- Goto done
- path_ok:
- ; no need to set path. Already done by the GTK+ Installer
- IfSilent "" +2
- StrCpy $CB_PATH_VALUE "0"
- done:
+!ifdef RUNTIME_ONLY
+ !insertmacro MUI_HEADER_TEXT "$(MISC_INSTALL_OPTION)" "$(MISC_ANSWER_SYSTEM)"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "PathQuestion.ini" "Field 1" "Text" "$(GTKMM_ADD_PATH)"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "PathQuestion.ini"
+!else
+ ; always set path in development installer
+ IfSilent +2 0
+ StrCpy $CB_PATH_VALUE "1"
+!endif
FunctionEnd
Modified: trunk/win32_installer/gtkmm-vc80-2_4.vsprops
==============================================================================
--- trunk/win32_installer/gtkmm-vc80-2_4.vsprops (original)
+++ trunk/win32_installer/gtkmm-vc80-2_4.vsprops Tue Mar 17 20:43:28 2009
@@ -8,7 +8,7 @@
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""
- DisableSpecificWarnings="4250"
+ DisableSpecificWarnings="4250;4312"
/>
<Tool
Name="VCLinkerTool"
Modified: trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops
==============================================================================
--- trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops (original)
+++ trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops Tue Mar 17 20:43:28 2009
@@ -8,7 +8,7 @@
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""
- DisableSpecificWarnings="4250"
+ DisableSpecificWarnings="4250;4312"
/>
<Tool
Name="VCLinkerTool"
Modified: trunk/win32_installer/install-msvc-module
==============================================================================
--- trunk/win32_installer/install-msvc-module (original)
+++ trunk/win32_installer/install-msvc-module Tue Mar 17 20:43:28 2009
@@ -12,7 +12,7 @@
# TODO: Automatically find latest version of package: First try SVN checkout, then look for latest installed tarball version.
if test $module = 'libsigc++'; then
# Path to extracted tarball or SVN checkout
- sourcepath="${basepath}/libsigc++"
+ sourcepath="${basepath}/libsigc++-2.2.3"
# Basename of DLL
basename='sigc'
# Version tag of DLL name
@@ -22,43 +22,43 @@
# Subdirectory in MSVC_Net2005
subdir='.'
elif test $module = 'glibmm'; then
- sourcepath="${basepath}/glibmm-2.18.1"
+ sourcepath="${basepath}/glibmm-2.20.0"
basename='glibmm'
vername='2_4'
abiname='glibmm-2.4'
subdir='glibmm'
elif test $module = 'giomm'; then
- sourcepath="${basepath}/glibmm-2.18.1"
+ sourcepath="${basepath}/glibmm-2.20.0"
basename='giomm'
vername='2_4'
abiname='giomm-2.4'
subdir='giomm'
elif test $module = 'cairomm'; then
- sourcepath="${basepath}/cairomm-1.7.2"
+ sourcepath="${basepath}/cairomm-1.8.0"
basename='cairomm'
vername='1_0'
abiname='cairomm-1.0'
subdir='cairomm'
elif test $module = 'pangomm'; then
- sourcepath="${basepath}/pangomm-2.14.0"
+ sourcepath="${basepath}/pangomm-2.24.0"
basename='pangomm'
vername='1_4'
abiname='pangomm-1.4'
subdir='pangomm'
elif test $module = 'atkmm'; then
- sourcepath="${basepath}/gtkmm-2.14.3"
+ sourcepath="${basepath}/gtkmm-2.16.0"
basename='atkmm'
vername='1_6'
abiname='atkmm-1.6'
subdir='atkmm'
elif test $module = 'gdkmm'; then
- sourcepath="${basepath}/gtkmm-2.14.3"
+ sourcepath="${basepath}/gtkmm-2.16.0"
basename='gdkmm'
vername='2_4'
abiname='gdkmm-2.4'
subdir='gdkmm'
elif test $module = 'gtkmm'; then
- sourcepath="${basepath}/gtkmm-2.14.3"
+ sourcepath="${basepath}/gtkmm-2.16.0"
basename='gtkmm'
vername='2_4'
abiname='gtkmm-2.4'
@@ -70,7 +70,7 @@
abiname='glademm-2.4'
subdir='libglademm'
elif test $module = 'libxml++'; then
- sourcepath="${basepath}/libxml++-2.24.2"
+ sourcepath="${basepath}/libxml++-2.26.0"
basename='xml++'
vername='2_6'
abiname='libxml++-2.6'
Added: trunk/win32_installer/redist_README.txt
==============================================================================
--- (empty file)
+++ trunk/win32_installer/redist_README.txt Tue Mar 17 20:43:28 2009
@@ -0,0 +1,11 @@
+This directory contains files which are meant to be redistributed with
+applications using gtkmm. It contains stripped versions of all GTK+ DLLs and
+the MinGW-built gtkmm DLLs. The gtkmm DLLs in this directory have been
+compiled using the "-O2" compiler switch whereas the ones in bin/ have been
+compiled with "-O0 -g", to ease debugging.
+
+When redistributing a MinGW-built application, use all the files from here.
+When redistributing a MSVC-built application, use the GTK+ DLLs from here
+(all but libsigc-*.dll, libglibmm-*.dll libgiomm-*.dll libcairomm-*.dll,
+libpangomm*-.dll, libatkmm*-.dll, libgdkmm*-.dll, libgtkmm*-.dll,
+libxml++-*.dll and libglademm*-.dll) and the gtkmm MSVC DLLs from bin/.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
