New files, used to generate corresponding non-.in files when making a

* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
 	New files, used to generate corresponding non-.in files when
 	making a dist. This is just so the version numbers will be kept in
 	synch automatically.

	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.

	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.

	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
 	then exit.

	* glib.def: Add a couple of functions.

ChangeLog

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

ChangeLog.pre-2-0

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

ChangeLog.pre-2-10

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

ChangeLog.pre-2-12

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

ChangeLog.pre-2-2

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

ChangeLog.pre-2-4

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

ChangeLog.pre-2-6

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

ChangeLog.pre-2-8

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+	
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+	
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+	
 Sat May  1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* acinclude.m4

Makefile.am

@@ -18,6 +18,7 @@ EXTRA_DIST = \
 	README.win32		\
 	glib.def		\
 	makefile.msc		\
+	makefile.cygwin		\
 	giowin32.c		\
 	glibconfig.h.win32	\
 	config.h.win32
@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib.m4
 
+glibconfig.h.win32: $(top_builddir)/config.status glibconfig.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.h.win32: $(top_builddir)/config.status config.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.msc: $(top_builddir)/config.status makefile.msc.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.cygwin: $(top_builddir)/config.status makefile.cygwin.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files release sanity snapshot
 
 files:

README.win32

@@ -44,14 +44,15 @@ short. Otherwise stat() calls will fail.
 Before building you must get the pthreads library for Win32 from
 http://sourceware.cygnus.com/pthreads-win32/. The pthreads-win32
 snapshot from 1999-04-07 is the one that should be used. Edit the
-location of the pthreads library and include files in makefile.msc.
+location of the pthreads library and include files in makefile.msc or
+makefile.cygwin.
 
 If using the Microsoft toolchain, build with `nmake -f
 makefile.msc`. Install with `nmake -f makefile.msc install`.  If using
 egcs, build using `make -f makefile.cygwin`.
 
 To test the GLib functions, go to the tests subdirectory and enter
-`nmake -f makefile.msc check`.
+`nmake -f makefile.msc check` or `make -f makefile.cygwin check`.
 
 If you would want to use the cygwin tools to generate executables that
 *do* use the cygwin runtime, the normal Unix configuration method
@@ -83,7 +84,7 @@ Some of the usage of these macros was 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 changed to
-NATIVE_WIN32.
+NATIVE_WIN32. NATIVE_WIN32 should maybe be renamed to USE_MSVCRT.
 
 The pthreads for Win32 package that the thread support uses isn't
 quite ready yet, and thus threads really should not be relied upon.

config.h.win32.in

@@ -54,11 +54,11 @@
 /* #undef G_VA_COPY_AS_ARRAY */
 #define G_HAVE___INLINE 1
 
-#define GLIB_MAJOR_VERSION 1
+#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
-#define GLIB_MINOR_VERSION 3
+#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
-#define GLIB_MICRO_VERSION 0
+#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
-#define GLIB_INTERFACE_AGE 0
+#define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@
-#define GLIB_BINARY_AGE 0
+#define GLIB_BINARY_AGE @GLIB_BINARY_AGE@
 
 #define G_THREAD_SOURCE "gthread-posix.c"
 

configure.in

@@ -40,7 +40,11 @@ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
 dnl
 AC_DIVERT_POP()dnl
 
+AC_SUBST(GLIB_MAJOR_VERSION)
+AC_SUBST(GLIB_MINOR_VERSION)
 AC_SUBST(GLIB_VERSION)
+AC_SUBST(GLIB_INTERFACE_AGE)
+AC_SUBST(GLIB_BINARY_AGE)
 
 # libtool versioning
 LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION

gbacktrace.c

@@ -59,8 +59,10 @@
 #include <string.h> /* for bzero on BSD systems */
 #endif
 
-#ifdef _MSC_VER
+#ifdef NATIVE_WIN32
-#include <process.h>		/* For _getpid() */
+#  define STRICT		/* Strict typing, please */
+#  include <windows.h>
+#  include <process.h>		/* For _getpid() */
 #endif
 
 #ifndef NO_FD_SET
@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
 void
 g_on_error_query (const gchar *prg_name)
 {
+#ifndef NATIVE_WIN32
   static const gchar *query1 = "[E]xit, [H]alt";
   static const gchar *query2 = ", show [S]tack trace";
   static const gchar *query3 = " or [P]roceed";
@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
     }
   else
     goto retry;
+#else
+  if (!prg_name)
+    prg_name = g_get_prgname ();
+  
+  MessageBox (NULL, "Terminating",
+	      (prg_name && *prg_name) ? prg_name : NULL,
+	      MB_OK|MB_ICONERROR);
+  _exit(0);
+#endif
 }
 
 void

gerror.c

@@ -59,8 +59,10 @@
 #include <string.h> /* for bzero on BSD systems */
 #endif
 
-#ifdef _MSC_VER
+#ifdef NATIVE_WIN32
-#include <process.h>		/* For _getpid() */
+#  define STRICT		/* Strict typing, please */
+#  include <windows.h>
+#  include <process.h>		/* For _getpid() */
 #endif
 
 #ifndef NO_FD_SET
@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
 void
 g_on_error_query (const gchar *prg_name)
 {
+#ifndef NATIVE_WIN32
   static const gchar *query1 = "[E]xit, [H]alt";
   static const gchar *query2 = ", show [S]tack trace";
   static const gchar *query3 = " or [P]roceed";
@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
     }
   else
     goto retry;
+#else
+  if (!prg_name)
+    prg_name = g_get_prgname ();
+  
+  MessageBox (NULL, "Terminating",
+	      (prg_name && *prg_name) ? prg_name : NULL,
+	      MB_OK|MB_ICONERROR);
+  _exit(0);
+#endif
 }
 
 void

glib.def

@@ -353,6 +353,8 @@ EXPORTS
 	g_str_equal
 	g_str_hash
 	g_strcasecmp
+	g_strchomp
+	g_strchug
 	g_strconcat
 	g_strdelimit
 	g_strdown

glib/Makefile.am

@@ -18,6 +18,7 @@ EXTRA_DIST = \
 	README.win32		\
 	glib.def		\
 	makefile.msc		\
+	makefile.cygwin		\
 	giowin32.c		\
 	glibconfig.h.win32	\
 	config.h.win32
@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib.m4
 
+glibconfig.h.win32: $(top_builddir)/config.status glibconfig.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.h.win32: $(top_builddir)/config.status config.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.msc: $(top_builddir)/config.status makefile.msc.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.cygwin: $(top_builddir)/config.status makefile.cygwin.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files release sanity snapshot
 
 files:

glib/gbacktrace.c

@@ -59,8 +59,10 @@
 #include <string.h> /* for bzero on BSD systems */
 #endif
 
-#ifdef _MSC_VER
+#ifdef NATIVE_WIN32
-#include <process.h>		/* For _getpid() */
+#  define STRICT		/* Strict typing, please */
+#  include <windows.h>
+#  include <process.h>		/* For _getpid() */
 #endif
 
 #ifndef NO_FD_SET
@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
 void
 g_on_error_query (const gchar *prg_name)
 {
+#ifndef NATIVE_WIN32
   static const gchar *query1 = "[E]xit, [H]alt";
   static const gchar *query2 = ", show [S]tack trace";
   static const gchar *query3 = " or [P]roceed";
@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
     }
   else
     goto retry;
+#else
+  if (!prg_name)
+    prg_name = g_get_prgname ();
+  
+  MessageBox (NULL, "Terminating",
+	      (prg_name && *prg_name) ? prg_name : NULL,
+	      MB_OK|MB_ICONERROR);
+  _exit(0);
+#endif
 }
 
 void

glib/gerror.c

@@ -59,8 +59,10 @@
 #include <string.h> /* for bzero on BSD systems */
 #endif
 
-#ifdef _MSC_VER
+#ifdef NATIVE_WIN32
-#include <process.h>		/* For _getpid() */
+#  define STRICT		/* Strict typing, please */
+#  include <windows.h>
+#  include <process.h>		/* For _getpid() */
 #endif
 
 #ifndef NO_FD_SET
@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
 void
 g_on_error_query (const gchar *prg_name)
 {
+#ifndef NATIVE_WIN32
   static const gchar *query1 = "[E]xit, [H]alt";
   static const gchar *query2 = ", show [S]tack trace";
   static const gchar *query3 = " or [P]roceed";
@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
     }
   else
     goto retry;
+#else
+  if (!prg_name)
+    prg_name = g_get_prgname ();
+  
+  MessageBox (NULL, "Terminating",
+	      (prg_name && *prg_name) ? prg_name : NULL,
+	      MB_OK|MB_ICONERROR);
+  _exit(0);
+#endif
 }
 
 void

glib/glib.def

@@ -353,6 +353,8 @@ EXPORTS
 	g_str_equal
 	g_str_hash
 	g_strcasecmp
+	g_strchomp
+	g_strchug
 	g_strconcat
 	g_strdelimit
 	g_strdown

glib/makefile.msc.in

@@ -7,22 +7,28 @@ BIN = C:\bin
 
 # This is the location of pthreads for Win32, 
 # see http://sourceware.cygnus.com/pthreads-win32/
+# We want the 1999-04-07 snapshot.
 PTHREADS = ..\pthreads-snap-1999-04-07
 PTHREAD_LIB = $(PTHREADS)\pthread.lib
 PTHREAD_INC = -I $(PTHREADS)
 
+# Full optimization:
+OPTIMIZE = -Ox
+# Debugging:
+#OPTIMIZE = -Zi
+
 ################################################################
 
 # Nothing much configurable below
 
-# cl -? described the options
+# cl -? describes the options
-CC = cl -G5 -GF -Ox -W3 -MD -nologo
+CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -nologo
 
-# No general LDFLAGS needes
+# No general LDFLAGS needed
-LDFLAGS = /link 
+LDFLAGS = /link # /debug
 INSTALL = copy
 
-GLIB_VER = 1.3
+GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 CFLAGS = -I. -DHAVE_CONFIG_H
 

glibconfig.h.win32.in

@@ -97,9 +97,9 @@ typedef unsigned long long guint64;
 #define alloca _alloca
 #endif
 
-#define GLIB_MAJOR_VERSION 1
+#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
-#define GLIB_MINOR_VERSION 3
+#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
-#define GLIB_MICRO_VERSION 0
+#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
 
 #ifdef	__cplusplus
 #define	G_HAVE_INLINE	1
@@ -119,7 +119,7 @@ typedef unsigned long long guint64;
  *   printf ("sizeof (pthread_mutex_t) = %d\n", sizeof (pthread_mutex_t));
  *   printf ("PTHREAD_MUTEX_INITIALIZER = ");
  *   for (i = 0; i < sizeof (pthread_mutex_t); i++)
- *     printf ("%u, ", (unsigned) ((unsigned char *) &m)[i]);
+ *     printf ("%u, ", ((unsigned char *) &m)[i]);
  *   printf ("\n");
  *   exit(0);
  * }

gmodule/ChangeLog

@@ -1,3 +1,7 @@
+1999-05-06  Tor Lillqvist  <tml@iki.fi>
+	
+	* gmodule.c: Remove LibMain.
+	
 Sat May  1 10:58:57 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* Makefile.am: use -avoid-version and -module for test plugins

gmodule/gmodule.c

@@ -170,17 +170,6 @@ _g_module_build_path (const gchar *directory,
 }
 #endif	/* no implementation */
 
-#if defined (NATIVE_WIN32) && defined (__LCC__)
-int __stdcall 
-LibMain (void         *hinstDll,
-	 unsigned long dwReason,
-	 void         *reserved)
-{
-  return 1;
-}
-#endif /* NATIVE_WIN32 && __LCC__ */
-
-
 /* --- functions --- */
 gboolean
 g_module_supported (void)

makefile.cygwin.in

@@ -8,6 +8,7 @@ BIN = /bin
 
 # This is the location of pthreads for Win32, 
 # see http://sourceware.cygnus.com/pthreads-win32/
+# We want the 1999-04-07 snapshot.
 PTHREADS = ../pthreads-snap-1999-04-07
 PTHREAD_LIB = -L$(PTHREADS) -lpthread
 PTHREAD_INC = -I $(PTHREADS)
@@ -25,7 +26,7 @@ LD = ld
 DLLTOOL = dlltool
 INSTALL = install
 
-GLIB_VER = 1.3
+GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 CFLAGS = $(OPTIMIZE) -I. -DHAVE_CONFIG_H
 

makefile.msc.in

@@ -0,0 +1,173 @@
+## Makefile for building the GLib, gmodule and gthread dlls with Microsoft C
+## Use: nmake -f makefile.msc install
+
+# Change this to wherever you want to install the DLLs. This directory
+# should be in your PATH.
+BIN = C:\bin
+
+# This is the location of pthreads for Win32, 
+# see http://sourceware.cygnus.com/pthreads-win32/
+# We want the 1999-04-07 snapshot.
+PTHREADS = ..\pthreads-snap-1999-04-07
+PTHREAD_LIB = $(PTHREADS)\pthread.lib
+PTHREAD_INC = -I $(PTHREADS)
+
+# Full optimization:
+OPTIMIZE = -Ox
+# Debugging:
+#OPTIMIZE = -Zi
+
+################################################################
+
+# Nothing much configurable below
+
+# cl -? describes the options
+CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -nologo
+
+# No general LDFLAGS needed
+LDFLAGS = /link # /debug
+INSTALL = copy
+
+GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
+
+CFLAGS = -I. -DHAVE_CONFIG_H
+
+all : \
+	glibconfig.h	\
+	config.h	\
+	glib-$(GLIB_VER).dll	\
+	gmodule\gmoduleconf.h \
+	gmodule-$(GLIB_VER).dll	\
+	gthread-$(GLIB_VER).dll \
+	testglib.exe	\
+	testgmodule.exe	\
+	testgdate.exe	\
+	testgdateparser.exe \
+	testgthread.exe
+
+install : all
+	$(INSTALL) glib-$(GLIB_VER).dll $(BIN)
+	$(INSTALL) gmodule-$(GLIB_VER).dll $(BIN)
+	$(INSTALL) gthread-$(GLIB_VER).dll $(BIN)
+
+glib_OBJECTS = \
+	garray.obj	\
+	gcache.obj	\
+	gcompletion.obj	\
+	gdataset.obj	\
+	gdate.obj	\
+	gerror.obj	\
+	ghook.obj	\
+	ghash.obj	\
+	giochannel.obj	\
+	giowin32.obj	\
+	glist.obj	\
+	gmain.obj	\
+	gmem.obj	\
+	gmessages.obj	\
+	gmutex.obj	\
+	gnode.obj	\
+	gprimes.obj	\
+	gqueue.obj	\
+	grand.obj	\
+	gslist.obj	\
+	gstack.obj	\
+	gtimer.obj	\
+	gtree.obj	\
+	grel.obj	\
+	gstring.obj	\
+	gstrfuncs.obj	\
+	gscanner.obj	\
+	gutils.obj
+
+glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
+	$(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
+
+glibconfig.h: glibconfig.h.win32
+	copy glibconfig.h.win32 glibconfig.h
+
+config.h: config.h.win32
+	copy config.h.win32 config.h
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
+
+gmodule_OBJECTS = \
+	gmodule.obj
+
+gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule\gmodule.def
+	$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def
+
+gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c
+	$(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=g_log_domain_gmodule gmodule\gmodule.c
+
+gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32
+	copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h
+
+gthread_OBJECTS = \
+	gthread.obj
+
+gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread\gthread.def
+	$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /def:gthread\gthread.def
+
+gthread.obj : gthread\gthread.c gthread\gthread-posix.c
+	$(CC) $(CFLAGS) -GD $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread.c
+
+testglib.exe : glib-$(GLIB_VER).dll testglib.obj
+	$(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
+
+testglib.obj : testglib.c
+	$(CC) -c $(CFLAGS) testglib.c
+
+testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj
+	$(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
+
+testgdate.obj : testgdate.c
+	$(CC) -c $(CFLAGS) testgdate.c
+
+testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj
+	$(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
+
+testgdateparser.obj : testgdateparser.c
+	$(CC) -c $(CFLAGS) testgdateparser.c
+
+testgmodule.exe : glib-$(GLIB_VER).dll gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll
+	$(CC) $(CFLAGS) testgmodule.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console 
+
+testgmodule.obj : gmodule\testgmodule.c
+	$(CC) $(CFLAGS) -Igmodule -c gmodule\testgmodule.c
+
+libgplugin_a.dll : libgplugin_a.obj
+	$(CC) $(CFLAGS) -LD libgplugin_a.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS)
+
+libgplugin_a.obj : gmodule\libgplugin_a.c
+	$(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_a.c
+
+libgplugin_b.dll : libgplugin_b.obj
+	$(CC) $(CFLAGS) -LD libgplugin_b.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib  $(LDFLAGS)
+
+libgplugin_b.obj : gmodule\libgplugin_b.c
+	$(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_b.c
+
+testgthread.exe : glib-$(GLIB_VER).dll gthread-$(GLIB_VER).dll testgthread.obj
+	$(CC) $(CFLAGS) testgthread.obj glib-$(GLIB_VER).lib gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /subsystem:console 
+
+testgthread.obj : gthread\testgthread.c
+	$(CC) $(CFLAGS) $(PTHREAD_INC) -c gthread\testgthread.c
+
+clean:
+	del config.h
+	del glibconfig.h
+	del gmodule\gmoduleconf.h
+	del *.exe
+	del *.obj
+	del *.dll
+	del *.lib
+	del *.err
+	del *.map
+	del *.sym
+	del *.exp
+	del *.lk1
+	del *.mk1
+	del *.pdb
+	del *.ilk

tests/Makefile.am

@@ -1,6 +1,10 @@
 
 INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@
 
+EXTRA_DIST = \
+	makefile.msc	\
+	makefile.cygwin
+
 TESTS = \
 	array-test	\
 	date-test	\
@@ -36,3 +40,8 @@ strfunc_test_LDADD = $(top_builddir)/libglib.la
 tree_test_LDADD = $(top_builddir)/libglib.la
 type_test_LDADD = $(top_builddir)/libglib.la
 
+makefile.msc: $(top_builddir)/config.status makefile.msc.in
+	cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.cygwin: $(top_builddir)/config.status makefile.cygwin.in
+	cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status

tests/makefile.cygwin.in

@@ -1,16 +1,17 @@
 ## Makefile for building the GLib test programs with egcs on cygwin.
 ## Use: make -f makefile.cygwin check
 
+OPTIMIZE = -g -O
+
 ################################################################
 
 # Nothing much configurable below
 
-# cl -? described the options
 CC = gcc -mno-cygwin -mpentium
 
-GLIB_VER = 1.3
+GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
-CFLAGS = -I.. -DHAVE_CONFIG_H
+CFLAGS = $(OPTIMIZE) -I.. -DHAVE_CONFIG_H
 
 TESTS = \
 	array-test.exe	\

tests/makefile.msc.in

@@ -5,13 +5,13 @@
 
 # Nothing much configurable below
 
-# cl -? described the options
+# cl -? describes the options
 CC = cl -G5 -GF -Ox -W3 -MD -nologo
 
-# No general LDFLAGS needes
+# No general LDFLAGS needed
 LDFLAGS = /link
 
-GLIB_VER = 1.3
+GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 CFLAGS = -I.. -DHAVE_CONFIG_H