1999-05-08 10:42:47 +02:00
|
|
|
General
|
|
|
|
=======
|
|
|
|
|
Merge in current Win32 version. Almost no Unix code touched.
* README.win32: More text.
* config.h.win32 glibconfig.h.win32: Update to match the
corresponding generated files on Unix.
* makefile.msc: Update with new source files, and gthread
library. Use the compiler flag -MD instead of using -D_DLL and
"/nodefaultlib:libc msvcrt.lib" in the link phase.
* glib.def: Include new functions, drop removed ones.
* glib.h: Add comments about main loop and polling on Win32. (In
general, it's only for the GIMP's use.) Add Win32 IO Channel
functions. Remove the obsoleted old IO Channel stuff (which was
in #if 0 already).
* giowin32.c: New file.
* gmain.c: Include config.h, conditionalize <sys/time.h>
inclusion. Add g_poll implementation for Win32 (only for the
GIMP's needs for now, it's hard or even impossible to be as clean
and generic as on Unix). Implement g_get_current_time on Win32. If
threads aren't supported, don't try to wake up main thread's
loop. On Win32, use a semaphore and not a pipe to wake up the main
loop.
* gmessages.c: On Win32, allocate a console window if the standard
output handle is invalid before writing to stdout, and reopen stdout
to that console window.
* giochannel.c: Conditionalize unistd.h inclusion. Some indentation
cleanup.
* gstrfuncs.c: Include <signal.h>.
* gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH
environment variables.
* gmodule-dl.c gmodule-dld.c: In
_g_module_build_path, don't add the "lib" prefix and
".so" or ".sl" suffix if already there.
* gmodule-win32.c: Likewise for the ".dll" suffix.
* gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
|
|
|
For more information about the port or GLib, GTk+ and the GIMP to
|
1999-02-25 22:34:25 +01:00
|
|
|
native Windows, and pre-built binary packages, see
|
|
|
|
http://www.iki.fi/tml/gimp/win32/ . "Native" means that we use the
|
makefile.mingw.in tests/makefile.mingw.in Rename makefile.cygwin(.in) to
2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in
* tests/makefile.mingw.in
* build-dll: Rename makefile.cygwin(.in) to
makefile.mingw(.in), which better describes what it is. Move the
build of gmodule, gthread and gobject DLLs to makefiles in those
directories. Move resource file handling and build number bump to
build-dll, where it sits much cleaner.
* README.win32
* Makefile.am (EXTRA_DIST): Update accordingly.
* glib.h: Add G_PI, G_PI_2, G_PI_4, G_E, G_LN2, G_LN10 and
G_SQRT2. M_PI etc aren't necessarily in <math.h> in strict ISO C
implementations.
* glib.def: Add g_strcanon.
* gtree.c (g_tree_node_rotate_left): Remove unused variables.
* gwin32.c (g_win32_opendir): Remove unneeded statement.
gmodule:
* makefile.mingw.in: New file, with gmodule stuff
moved from ../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, and add rule to make makefile.mingw.
gobject:
* makefile.mingw.in
* gobject.def
* gobject.rc.in: New files, for Win32 (mingw) build.
* Makefile.am: Add to EXTRA_DIST. Add rules to produce the
corresponding non-*.in files.
* gtype.h: (Win32:) Mark _g_type_fundamental_last for
export/import from DLL.
gthread:
* makefile.mingw.in: New file, with gthread stuff moved from
../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, add rule to build makefile.mingw.
2000-05-13 21:30:58 +02:00
|
|
|
Win32 API only, and not any POSIX operating system emulation layer
|
2000-07-05 00:52:51 +02:00
|
|
|
except that provided by the Microsoft runtime C library. Actually,
|
makefile.mingw.in tests/makefile.mingw.in Rename makefile.cygwin(.in) to
2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in
* tests/makefile.mingw.in
* build-dll: Rename makefile.cygwin(.in) to
makefile.mingw(.in), which better describes what it is. Move the
build of gmodule, gthread and gobject DLLs to makefiles in those
directories. Move resource file handling and build number bump to
build-dll, where it sits much cleaner.
* README.win32
* Makefile.am (EXTRA_DIST): Update accordingly.
* glib.h: Add G_PI, G_PI_2, G_PI_4, G_E, G_LN2, G_LN10 and
G_SQRT2. M_PI etc aren't necessarily in <math.h> in strict ISO C
implementations.
* glib.def: Add g_strcanon.
* gtree.c (g_tree_node_rotate_left): Remove unused variables.
* gwin32.c (g_win32_opendir): Remove unneeded statement.
gmodule:
* makefile.mingw.in: New file, with gmodule stuff
moved from ../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, and add rule to make makefile.mingw.
gobject:
* makefile.mingw.in
* gobject.def
* gobject.rc.in: New files, for Win32 (mingw) build.
* Makefile.am: Add to EXTRA_DIST. Add rules to produce the
corresponding non-*.in files.
* gtype.h: (Win32:) Mark _g_type_fundamental_last for
export/import from DLL.
gthread:
* makefile.mingw.in: New file, with gthread stuff moved from
../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, add rule to build makefile.mingw.
2000-05-13 21:30:58 +02:00
|
|
|
a pthreads emulation library is used.
|
1999-02-25 22:34:25 +01:00
|
|
|
|
2000-07-05 00:52:51 +02:00
|
|
|
To build GLib on Win32, you can use either gcc or the Microsoft
|
|
|
|
compiler and tools. Both the compiler from MSVC 5.0 and from MSVC 6.0
|
|
|
|
have been used successfully. However, the makefiles for MSVC are not
|
|
|
|
up-to-date, sorry. If you fix the makefile.msc files, and manage to
|
2000-07-22 13:54:19 +02:00
|
|
|
build with MSVC, please send the updated makefile.msc files to the
|
2000-07-05 00:52:51 +02:00
|
|
|
gimpwin-dev list.
|
|
|
|
|
|
|
|
With gcc I mean gcc-2.95 or gcc-2.95.2 as distributed by Mumit Khan,
|
|
|
|
either as a mingw version (preferred), or running under cygwin. To
|
|
|
|
successfully use gcc, follow the instructions below. We want to use
|
|
|
|
gcc -mno-cygwin, i.e. produce executables (.exe and .dll files) that
|
|
|
|
do *not* require the cygwin runtime library. This is called "mingw".
|
2000-07-22 13:54:19 +02:00
|
|
|
I also use the -fnative-struct flag, which means that in order to use
|
|
|
|
the prebuilt DLLs (especiall of GTK+), you *must* also use that flag.
|
|
|
|
(This flag means that the struct layout is identical to that used by
|
|
|
|
MSVC.)
|
1999-02-25 22:34:25 +01:00
|
|
|
|
1999-04-13 23:05:08 +02:00
|
|
|
To test the GLib functions, go to the tests subdirectory and enter
|
makefile.mingw.in tests/makefile.mingw.in Rename makefile.cygwin(.in) to
2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in
* tests/makefile.mingw.in
* build-dll: Rename makefile.cygwin(.in) to
makefile.mingw(.in), which better describes what it is. Move the
build of gmodule, gthread and gobject DLLs to makefiles in those
directories. Move resource file handling and build number bump to
build-dll, where it sits much cleaner.
* README.win32
* Makefile.am (EXTRA_DIST): Update accordingly.
* glib.h: Add G_PI, G_PI_2, G_PI_4, G_E, G_LN2, G_LN10 and
G_SQRT2. M_PI etc aren't necessarily in <math.h> in strict ISO C
implementations.
* glib.def: Add g_strcanon.
* gtree.c (g_tree_node_rotate_left): Remove unused variables.
* gwin32.c (g_win32_opendir): Remove unneeded statement.
gmodule:
* makefile.mingw.in: New file, with gmodule stuff
moved from ../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, and add rule to make makefile.mingw.
gobject:
* makefile.mingw.in
* gobject.def
* gobject.rc.in: New files, for Win32 (mingw) build.
* Makefile.am: Add to EXTRA_DIST. Add rules to produce the
corresponding non-*.in files.
* gtype.h: (Win32:) Mark _g_type_fundamental_last for
export/import from DLL.
gthread:
* makefile.mingw.in: New file, with gthread stuff moved from
../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, add rule to build makefile.mingw.
2000-05-13 21:30:58 +02:00
|
|
|
`nmake -f makefile.msc check` or `make -f makefile.mingw check`.
|
1999-04-13 23:05:08 +02:00
|
|
|
|
1999-04-24 15:52:51 +02:00
|
|
|
If you would want to use the cygwin tools to generate executables that
|
1999-04-25 22:52:42 +02:00
|
|
|
*do* use the cygwin runtime, the normal Unix configuration method
|
1999-05-08 10:42:47 +02:00
|
|
|
should work as if on Unix. But it won't produce DLLs. At least I
|
2000-07-05 00:52:51 +02:00
|
|
|
haven't succeeded in that. Also, I have no idea what changes are
|
|
|
|
necessary to the code for it to run successfully on cygwin.
|
1999-01-19 22:13:59 +01:00
|
|
|
|
|
|
|
With a little work, it might be possible to use the ./configure
|
1999-04-24 15:52:51 +02:00
|
|
|
mechanism also with a "mingw32" configuration.
|
1999-01-19 22:13:59 +01:00
|
|
|
|
1999-11-11 00:08:37 +01:00
|
|
|
The following preprocessor macro are used for conditional compilation
|
|
|
|
related to Win32:
|
1999-01-19 22:13:59 +01:00
|
|
|
|
1999-11-11 00:08:37 +01:00
|
|
|
- G_OS_WIN32 is defined when compiling for Win32, *and* without
|
1999-02-25 22:34:25 +01:00
|
|
|
any POSIX emulation, other that to the extent provided by the
|
1999-05-08 10:42:47 +02:00
|
|
|
bundled Microsoft C library (msvcrt.dll) and the pthreads-win32
|
|
|
|
library. For instance, pathnames are in the native Windows syntax.
|
1999-01-19 22:13:59 +01:00
|
|
|
|
1999-11-11 00:08:37 +01:00
|
|
|
- _WIN32 is defined by the compiler
|
|
|
|
|
|
|
|
The Win32 port uses the combination with both of those on. As
|
|
|
|
G_OS_WIN32 is defined in glibconfig.h, it is available to all source
|
|
|
|
files that use GLib (or GTk+, which uses GLib).
|
1999-01-19 22:13:59 +01:00
|
|
|
|
1999-04-24 15:52:51 +02:00
|
|
|
Additionally, there are the compiler-specific macros:
|
|
|
|
- _MSC_VER is defined when using the Microsoft compiler
|
1999-07-21 21:18:03 +02:00
|
|
|
- __GNUC__ is defined when using GCC
|
1999-01-19 22:13:59 +01:00
|
|
|
|
1999-06-21 00:20:43 +02:00
|
|
|
Some of the usage of these macros used to be a bit mixed up, and had
|
|
|
|
to be straightened out when adding the gcc support. In particular, I
|
|
|
|
used to check for _MSC_VER in some places where I really wanted to
|
|
|
|
check for the Microsoft C library, and those checks has now been
|
1999-11-11 00:08:37 +01:00
|
|
|
changed to G_OS_WIN32.
|
|
|
|
|
|
|
|
G_OS_WIN32 implies using the Microsoft C runtime MSVCRT.DLL.
|
1999-01-19 22:13:59 +01:00
|
|
|
|
2000-02-03 00:39:32 +01:00
|
|
|
Building software that use GLib or GTk+
|
|
|
|
=======================================
|
|
|
|
|
|
|
|
Unfortunately, even building software that just *use* GLib or GTk+
|
|
|
|
also require to have the right compiler set up the right way, so if
|
|
|
|
you intend to use gcc, follow the relevant instructions below in that
|
|
|
|
case, too.
|
|
|
|
|
1999-05-08 10:42:47 +02:00
|
|
|
Pthreads library
|
|
|
|
================
|
|
|
|
|
|
|
|
Before building you must get the pthreads library for Win32 from
|
|
|
|
http://sourceware.cygnus.com/pthreads-win32/. The pthreads-win32
|
1999-06-21 00:20:43 +02:00
|
|
|
snapshot from 1999-05-30 is the one that should be used. Edit the
|
1999-05-08 10:42:47 +02:00
|
|
|
location of the pthreads library and include files in makefile.msc or
|
makefile.mingw.in tests/makefile.mingw.in Rename makefile.cygwin(.in) to
2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in
* tests/makefile.mingw.in
* build-dll: Rename makefile.cygwin(.in) to
makefile.mingw(.in), which better describes what it is. Move the
build of gmodule, gthread and gobject DLLs to makefiles in those
directories. Move resource file handling and build number bump to
build-dll, where it sits much cleaner.
* README.win32
* Makefile.am (EXTRA_DIST): Update accordingly.
* glib.h: Add G_PI, G_PI_2, G_PI_4, G_E, G_LN2, G_LN10 and
G_SQRT2. M_PI etc aren't necessarily in <math.h> in strict ISO C
implementations.
* glib.def: Add g_strcanon.
* gtree.c (g_tree_node_rotate_left): Remove unused variables.
* gwin32.c (g_win32_opendir): Remove unneeded statement.
gmodule:
* makefile.mingw.in: New file, with gmodule stuff
moved from ../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, and add rule to make makefile.mingw.
gobject:
* makefile.mingw.in
* gobject.def
* gobject.rc.in: New files, for Win32 (mingw) build.
* Makefile.am: Add to EXTRA_DIST. Add rules to produce the
corresponding non-*.in files.
* gtype.h: (Win32:) Mark _g_type_fundamental_last for
export/import from DLL.
gthread:
* makefile.mingw.in: New file, with gthread stuff moved from
../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, add rule to build makefile.mingw.
2000-05-13 21:30:58 +02:00
|
|
|
makefile.mingw. The pthreads distribution includes the precompiled dll
|
1999-05-08 10:42:47 +02:00
|
|
|
and import libraries both for MSVC and gcc.
|
|
|
|
|
|
|
|
The pthreads for Win32 package that the thread support uses supposedly
|
|
|
|
isn't quite ready yet, and thus threads stuff should not be relied
|
|
|
|
upon for anything serious.
|
|
|
|
|
1999-06-21 00:20:43 +02:00
|
|
|
Where are the makefiles?
|
|
|
|
========================
|
|
|
|
|
|
|
|
If you are building from a CVS snapshot, you will not have any
|
2000-07-05 00:52:51 +02:00
|
|
|
makefile.mingw or makefile.msc file. You should copy the corresponding
|
|
|
|
makefile.mingw.in or makefile.msc.in file to that name, and edit the
|
|
|
|
line that sets GLIB_VER to the correct version number.
|
1999-06-21 00:20:43 +02:00
|
|
|
|
|
|
|
This is done automatically when an official distribution package is
|
|
|
|
built.
|
|
|
|
|
1999-05-08 10:42:47 +02:00
|
|
|
Building with gcc
|
|
|
|
=================
|
|
|
|
|
1999-11-11 00:08:37 +01:00
|
|
|
I use the latest and greatest gcc, gcc-2.95.2. 2.95 will also work.
|
|
|
|
Earlier version might, but you are on your own.
|
1999-07-21 21:18:03 +02:00
|
|
|
|
2000-03-26 22:56:07 +02:00
|
|
|
You can either use gcc running on cygwin, or the "pure" mingw
|
2000-07-05 00:52:51 +02:00
|
|
|
gcc. Using the latter is much easier.
|
|
|
|
|
|
|
|
Just fetch the latest version of gcc for mingw and the msvcrt runtime,
|
|
|
|
currently from
|
2000-03-26 22:56:07 +02:00
|
|
|
ftp://ftp.nanotech.wisc.edu/pub/khan/gnu-win32/mingw32/snapshots/gcc-2.95.2-1/
|
2000-07-05 00:52:51 +02:00
|
|
|
.
|
|
|
|
|
|
|
|
Download the three zip archives: the gcc-<version>-msvcrt,
|
2000-03-26 22:56:07 +02:00
|
|
|
mingw-msvcrt-<timestamp> and binutils-<timestamp>-msvcrt, and unpack
|
2000-07-05 00:52:51 +02:00
|
|
|
them in a suitable directory.
|
|
|
|
|
|
|
|
Set up your PATH so that the gcc from the bin directory that got
|
|
|
|
created above is the one that gets used. You can skip steps 1--5
|
|
|
|
below. Even if you run the mingw gcc, you still want to have cygwin to
|
|
|
|
run make in.
|
2000-03-26 22:56:07 +02:00
|
|
|
|
|
|
|
If you want to run a cygwin-based gcc, it gets much more
|
|
|
|
complicated. We still want gcc to produce code that does not use
|
2000-07-05 00:52:51 +02:00
|
|
|
cygwin, but the msvcrt runtime. The way to do this can be quite
|
|
|
|
complex, and the instructions are not included here. Contact me if you
|
|
|
|
want some possibly outdated, misleading and incomplete advice.
|
1999-11-11 00:08:37 +01:00
|
|
|
|
2000-07-05 00:52:51 +02:00
|
|
|
Building with MSVC
|
|
|
|
==================
|
1999-11-11 00:08:37 +01:00
|
|
|
|
2000-07-05 00:52:51 +02:00
|
|
|
If using the Microsoft toolchain, build with `nmake -f
|
|
|
|
makefile.msc`. Install with `nmake -f makefile.msc install`.
|
1999-06-28 08:06:34 +02:00
|
|
|
|
|
|
|
--Tor Lillqvist <tml@iki.fi>
|