summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--ChangeLog.pre-2-1012
-rw-r--r--ChangeLog.pre-2-1212
-rw-r--r--ChangeLog.pre-2-612
-rw-r--r--ChangeLog.pre-2-812
-rw-r--r--README.win3222
-rw-r--r--configure.in4
-rw-r--r--docs/reference/glib/cross.sgml2
8 files changed, 78 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 046332429..1b4fb2155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-01-01 J. Ali Harlow <ali@juiblex.co.uk>
+
+ * configure.in: Don't use AC_TRY_RUN to test for long long format
+ when using the MSVCRT.DLL runtime since we know the answer anyway
+ and it causes some mild inconvience when cross compiling.
+
+ * README.win32: Add a reference to the cross compiling section
+ of the reference manual.
+
+ * docs/reference/glib/cross.sgml: MinGW uses MSVCRT.DLL which
+ requires %I64i instead of %lli. (#161306)
+
2005-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c: Make the g_getenv() ABI backward compatibility
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 046332429..1b4fb2155 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2005-01-01 J. Ali Harlow <ali@juiblex.co.uk>
+
+ * configure.in: Don't use AC_TRY_RUN to test for long long format
+ when using the MSVCRT.DLL runtime since we know the answer anyway
+ and it causes some mild inconvience when cross compiling.
+
+ * README.win32: Add a reference to the cross compiling section
+ of the reference manual.
+
+ * docs/reference/glib/cross.sgml: MinGW uses MSVCRT.DLL which
+ requires %I64i instead of %lli. (#161306)
+
2005-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c: Make the g_getenv() ABI backward compatibility
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 046332429..1b4fb2155 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,15 @@
+2005-01-01 J. Ali Harlow <ali@juiblex.co.uk>
+
+ * configure.in: Don't use AC_TRY_RUN to test for long long format
+ when using the MSVCRT.DLL runtime since we know the answer anyway
+ and it causes some mild inconvience when cross compiling.
+
+ * README.win32: Add a reference to the cross compiling section
+ of the reference manual.
+
+ * docs/reference/glib/cross.sgml: MinGW uses MSVCRT.DLL which
+ requires %I64i instead of %lli. (#161306)
+
2005-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c: Make the g_getenv() ABI backward compatibility
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 046332429..1b4fb2155 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2005-01-01 J. Ali Harlow <ali@juiblex.co.uk>
+
+ * configure.in: Don't use AC_TRY_RUN to test for long long format
+ when using the MSVCRT.DLL runtime since we know the answer anyway
+ and it causes some mild inconvience when cross compiling.
+
+ * README.win32: Add a reference to the cross compiling section
+ of the reference manual.
+
+ * docs/reference/glib/cross.sgml: MinGW uses MSVCRT.DLL which
+ requires %I64i instead of %lli. (#161306)
+
2005-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c: Make the g_getenv() ABI backward compatibility
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 046332429..1b4fb2155 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2005-01-01 J. Ali Harlow <ali@juiblex.co.uk>
+
+ * configure.in: Don't use AC_TRY_RUN to test for long long format
+ when using the MSVCRT.DLL runtime since we know the answer anyway
+ and it causes some mild inconvience when cross compiling.
+
+ * README.win32: Add a reference to the cross compiling section
+ of the reference manual.
+
+ * docs/reference/glib/cross.sgml: MinGW uses MSVCRT.DLL which
+ requires %I64i instead of %lli. (#161306)
+
2005-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gutils.c: Make the g_getenv() ABI backward compatibility
diff --git a/README.win32 b/README.win32
index 562e6e8e7..d77c417c8 100644
--- a/README.win32
+++ b/README.win32
@@ -1,8 +1,8 @@
Tor Lillqvist <tml@iki.fi>
Hans Breuer <hans@breuer.org>
-The general parts, and the stuff about gcc and autoconfiscated build
-are by Tor Lillqvist. The stuff about MSVC build is by Hans Breuer.
+The general parts, and the section about gcc and autoconfiscated build
+are by Tor Lillqvist. The sections about MSVC build is by Hans Breuer.
General
=======
@@ -87,7 +87,8 @@ gettext-runtime (0.13.1 or newer) from www.gimp.org/win32/downloads.html.
Autoconfiscated build (with gcc)
================================
-Tor uses gcc 3.2. Version 2.95.3 also works.
+Tor uses gcc 3.3.1. Somewhat earlier or later versions presumably also
+work.
You can either use gcc running on Cygwin, or the "pure" mingw
gcc. Using the latter might work better, or at least did at some
@@ -149,6 +150,13 @@ libraries (DLLs) for Cygwin most probably requires you to have a very
new libtool. (And a new libtool probably requires rather new autoconf
and automake.) Tor hasn't tested this in a while, either.
+Cross-compiling
+===============
+
+It is possible to build GLib using a cross compiler. See
+docs/reference/glib/html/glib-cross-compiling.html (part of the
+GLib reference manual) for more information.
+
Building with MSVC
==================
@@ -192,14 +200,14 @@ nmake -f makefile.msc DEBUG=1
]
Required libraries (not build from cvs)
-==================
+------------------
libintl (gnu-intl), libiconv
libtiff, libpng, zlib, libjpeg
are available pre-built from the website mentioned above.
Versioning
-==========
+----------
Instead of the Unix and auto* way of tracking versions and resolving
dependencies (configure; make; make install) involving autoconf,
automake, libtool and friends the MSVC build uses a different
@@ -232,7 +240,7 @@ headers into a common place (as it is done on Unix, and as Tor does
when producing his zipfiles with prebuilt GLib, GTK+ etc).
Special Files
-=============
+-------------
config.h.win32.in : @XXX_MAJOR_VERSION@ needs to be replaced by
the current version/build number. The resulting file is to be saved
as 'config.h.win32'. This should be automatically done if a package
@@ -259,7 +267,7 @@ exported another mechanism is needed, like :
Directory Structure
-===================
+-------------------
all modules should be build in a common directory tree otherwise you
need to adapt the file 'module.defs'. They are listed here in increasing
dependencies order.
diff --git a/configure.in b/configure.in
index a001976de..700974739 100644
--- a/configure.in
+++ b/configure.in
@@ -533,7 +533,7 @@ else
])
fi
-if test x$ac_cv_sizeof_long_long = x8; then
+if test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8; then
# long long is a 64 bit integer.
AC_MSG_CHECKING(for format to printf and scanf a guint64)
AC_CACHE_VAL(glib_cv_long_long_format,[
@@ -564,7 +564,7 @@ if test x$ac_cv_sizeof_long_long = x8; then
elif test x$ac_cv_sizeof___int64 = x8; then
# __int64 is a 64 bit integer.
AC_MSG_CHECKING(for format to printf and scanf a guint64)
- # We know this is MSVC, and what the formats are
+ # We know this is MSVCRT.DLL, and what the formats are
glib_cv_long_long_format=I64
AC_MSG_RESULT(%${glib_cv_long_long_format}u)
AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long])
diff --git a/docs/reference/glib/cross.sgml b/docs/reference/glib/cross.sgml
index e39c7cc42..4f39f9419 100644
--- a/docs/reference/glib/cross.sgml
+++ b/docs/reference/glib/cross.sgml
@@ -40,7 +40,7 @@ How to cross-compile GLib
create a file 'win32.cache' with the following contents:
</para>
<programlisting>
-glib_cv_long_long_format=ll
+glib_cv_long_long_format=I64
glib_cv_stack_grows=no
</programlisting>
<para>