diff options
author | Tor Lillqvist <tml@iki.fi> | 2003-06-17 23:49:40 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2003-06-17 23:49:40 +0000 |
commit | 36485f1ce1e6b411022e7fcb609e182ce4bc9637 (patch) | |
tree | 60a57153277e9d391fe9c303da4cee2df984a6f4 | |
parent | 6fa19beb31e9f54992a7919b1ff83f5508953e08 (diff) | |
download | gdk-pixbuf-36485f1ce1e6b411022e7fcb609e182ce4bc9637.tar.gz |
Look for DLLs also in the bin subdirectory, where libtool 1.5 installs
2003-06-17 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in (DLLDIR): Look for DLLs also in the bin
subdirectory, where libtool 1.5 installs them.
* README.win32: Point to FSF's binary Win32 distribution of
gettext-runtime.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
-rw-r--r-- | README.win32 | 23 | ||||
-rwxr-xr-x | gtk-zip.sh.in | 11 |
7 files changed, 63 insertions, 11 deletions
@@ -1,3 +1,11 @@ +2003-06-17 Tor Lillqvist <tml@iki.fi> + + * gtk-zip.sh.in (DLLDIR): Look for DLLs also in the bin + subdirectory, where libtool 1.5 installs them. + + * README.win32: Point to FSF's binary Win32 distribution of + gettext-runtime. + 2003-06-17 Matthias Clasen <maclas@gmx.de> * acinclude.m4 (JH_PATH_XML_CATALOG, JH_CHECK_XML_CATALOG): New diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index dad0e8e98..a4fe42f50 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2003-06-17 Tor Lillqvist <tml@iki.fi> + + * gtk-zip.sh.in (DLLDIR): Look for DLLs also in the bin + subdirectory, where libtool 1.5 installs them. + + * README.win32: Point to FSF's binary Win32 distribution of + gettext-runtime. + 2003-06-17 Matthias Clasen <maclas@gmx.de> * acinclude.m4 (JH_PATH_XML_CATALOG, JH_CHECK_XML_CATALOG): New diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index dad0e8e98..a4fe42f50 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2003-06-17 Tor Lillqvist <tml@iki.fi> + + * gtk-zip.sh.in (DLLDIR): Look for DLLs also in the bin + subdirectory, where libtool 1.5 installs them. + + * README.win32: Point to FSF's binary Win32 distribution of + gettext-runtime. + 2003-06-17 Matthias Clasen <maclas@gmx.de> * acinclude.m4 (JH_PATH_XML_CATALOG, JH_CHECK_XML_CATALOG): New diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index dad0e8e98..a4fe42f50 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2003-06-17 Tor Lillqvist <tml@iki.fi> + + * gtk-zip.sh.in (DLLDIR): Look for DLLs also in the bin + subdirectory, where libtool 1.5 installs them. + + * README.win32: Point to FSF's binary Win32 distribution of + gettext-runtime. + 2003-06-17 Matthias Clasen <maclas@gmx.de> * acinclude.m4 (JH_PATH_XML_CATALOG, JH_CHECK_XML_CATALOG): New diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index dad0e8e98..a4fe42f50 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2003-06-17 Tor Lillqvist <tml@iki.fi> + + * gtk-zip.sh.in (DLLDIR): Look for DLLs also in the bin + subdirectory, where libtool 1.5 installs them. + + * README.win32: Point to FSF's binary Win32 distribution of + gettext-runtime. + 2003-06-17 Matthias Clasen <maclas@gmx.de> * acinclude.m4 (JH_PATH_XML_CATALOG, JH_CHECK_XML_CATALOG): New diff --git a/README.win32 b/README.win32 index 1a0d46fa2..9ff6d1379 100644 --- a/README.win32 +++ b/README.win32 @@ -67,13 +67,22 @@ references to the wntab32x library from the makefile before building. Libintl ======= -GTK wants to be built with the GNU "intl" library for -internationalisation (i18n). Get the version ported to Win32 (not a -very big deal) from the web site mentioned above. The "intl" library -as gets built as a DLL called libintl-1.dll. If you don't want any -i18n stuff, undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in the -config.h.win32 file, and remove references to the intl library from -the makefiles. +Before building GTK+ you must also have GNU gettext. Get prebuilt +binaries of gettext-runtime (0.12.1 or newer) from your nearest GNU +ftp mirror. If you use gcc, you will also have to edit the libintl.h +file from gettext a tiny bit: Change the + +# if __GNUC__ >= 2 && !defined __APPLE_CC__ && (defined __STDC__ || defined __cplusplus) + +line to + +# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && (defined __STDC__ || defined __cplusplus) + +around line 102. + +If you use libtool, you will also have to copy intl.lib to libintl.a +so that libtool will find them. Alternatively, use pexports and +dlltool to generate a gcc import library. ActiveIMM ========= diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in index a60c5ef7c..cee5bac8c 100755 --- a/gtk-zip.sh.in +++ b/gtk-zip.sh.in @@ -5,14 +5,17 @@ ZIP=/tmp/gtk+-@GTK_VERSION@-`date +%Y%m%d`.zip DEVZIP=/tmp/gtk+-dev-@GTK_VERSION@-`date +%Y%m%d`.zip cd @prefix@ - rm $ZIP + +DLLDIR=lib +[ -f bin/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin + zip -r $ZIP -@ <<EOF COPYING.LIB-2 etc/gtk-2.0 -lib/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll -lib/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll -lib/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll +$DLLDIR/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll +$DLLDIR/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll +$DLLDIR/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll EOF zip $ZIP lib/gtk-2.0/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/immodules/*.dll |