Commit 2b688f54 authored by Tor Lillqvist's avatar Tor Lillqvist

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.
parent 380709d6
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
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> Sat May 1 10:26:20 PDT 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4 * acinclude.m4
......
...@@ -18,6 +18,7 @@ EXTRA_DIST = \ ...@@ -18,6 +18,7 @@ EXTRA_DIST = \
README.win32 \ README.win32 \
glib.def \ glib.def \
makefile.msc \ makefile.msc \
makefile.cygwin \
giowin32.c \ giowin32.c \
glibconfig.h.win32 \ glibconfig.h.win32 \
config.h.win32 config.h.win32
...@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la ...@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4 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 .PHONY: files release sanity snapshot
files: files:
......
...@@ -44,14 +44,15 @@ short. Otherwise stat() calls will fail. ...@@ -44,14 +44,15 @@ short. Otherwise stat() calls will fail.
Before building you must get the pthreads library for Win32 from Before building you must get the pthreads library for Win32 from
http://sourceware.cygnus.com/pthreads-win32/. The pthreads-win32 http://sourceware.cygnus.com/pthreads-win32/. The pthreads-win32
snapshot from 1999-04-07 is the one that should be used. Edit the 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 If using the Microsoft toolchain, build with `nmake -f
makefile.msc`. Install with `nmake -f makefile.msc install`. If using makefile.msc`. Install with `nmake -f makefile.msc install`. If using
egcs, build using `make -f makefile.cygwin`. egcs, build using `make -f makefile.cygwin`.
To test the GLib functions, go to the tests subdirectory and enter 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 If you would want to use the cygwin tools to generate executables that
*do* use the cygwin runtime, the normal Unix configuration method *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 ...@@ -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 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 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 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 The pthreads for Win32 package that the thread support uses isn't
quite ready yet, and thus threads really should not be relied upon. quite ready yet, and thus threads really should not be relied upon.
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
/* #undef G_VA_COPY_AS_ARRAY */ /* #undef G_VA_COPY_AS_ARRAY */
#define G_HAVE___INLINE 1 #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" #define G_THREAD_SOURCE "gthread-posix.c"
......
...@@ -40,7 +40,11 @@ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION ...@@ -40,7 +40,11 @@ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
dnl dnl
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_SUBST(GLIB_MAJOR_VERSION)
AC_SUBST(GLIB_MINOR_VERSION)
AC_SUBST(GLIB_VERSION) AC_SUBST(GLIB_VERSION)
AC_SUBST(GLIB_INTERFACE_AGE)
AC_SUBST(GLIB_BINARY_AGE)
# libtool versioning # libtool versioning
LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
......
...@@ -59,8 +59,10 @@ ...@@ -59,8 +59,10 @@
#include <string.h> /* for bzero on BSD systems */ #include <string.h> /* for bzero on BSD systems */
#endif #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 #endif
#ifndef NO_FD_SET #ifndef NO_FD_SET
...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE; ...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void void
g_on_error_query (const gchar *prg_name) g_on_error_query (const gchar *prg_name)
{ {
#ifndef NATIVE_WIN32
static const gchar *query1 = "[E]xit, [H]alt"; static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace"; static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed"; static const gchar *query3 = " or [P]roceed";
...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name) ...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
} }
else else
goto retry; 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 void
......
...@@ -59,8 +59,10 @@ ...@@ -59,8 +59,10 @@
#include <string.h> /* for bzero on BSD systems */ #include <string.h> /* for bzero on BSD systems */
#endif #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 #endif
#ifndef NO_FD_SET #ifndef NO_FD_SET
...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE; ...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void void
g_on_error_query (const gchar *prg_name) g_on_error_query (const gchar *prg_name)
{ {
#ifndef NATIVE_WIN32
static const gchar *query1 = "[E]xit, [H]alt"; static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace"; static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed"; static const gchar *query3 = " or [P]roceed";
...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name) ...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
} }
else else
goto retry; 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 void
......
...@@ -353,6 +353,8 @@ EXPORTS ...@@ -353,6 +353,8 @@ EXPORTS
g_str_equal g_str_equal
g_str_hash g_str_hash
g_strcasecmp g_strcasecmp
g_strchomp
g_strchug
g_strconcat g_strconcat
g_strdelimit g_strdelimit
g_strdown g_strdown
......
...@@ -18,6 +18,7 @@ EXTRA_DIST = \ ...@@ -18,6 +18,7 @@ EXTRA_DIST = \
README.win32 \ README.win32 \
glib.def \ glib.def \
makefile.msc \ makefile.msc \
makefile.cygwin \
giowin32.c \ giowin32.c \
glibconfig.h.win32 \ glibconfig.h.win32 \
config.h.win32 config.h.win32
...@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la ...@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4 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 .PHONY: files release sanity snapshot
files: files:
......
...@@ -59,8 +59,10 @@ ...@@ -59,8 +59,10 @@
#include <string.h> /* for bzero on BSD systems */ #include <string.h> /* for bzero on BSD systems */
#endif #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 #endif
#ifndef NO_FD_SET #ifndef NO_FD_SET
...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE; ...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void void
g_on_error_query (const gchar *prg_name) g_on_error_query (const gchar *prg_name)
{ {
#ifndef NATIVE_WIN32
static const gchar *query1 = "[E]xit, [H]alt"; static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace"; static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed"; static const gchar *query3 = " or [P]roceed";
...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name) ...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
} }
else else
goto retry; 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 void
......
...@@ -59,8 +59,10 @@ ...@@ -59,8 +59,10 @@
#include <string.h> /* for bzero on BSD systems */ #include <string.h> /* for bzero on BSD systems */
#endif #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 #endif
#ifndef NO_FD_SET #ifndef NO_FD_SET
...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE; ...@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void void
g_on_error_query (const gchar *prg_name) g_on_error_query (const gchar *prg_name)
{ {
#ifndef NATIVE_WIN32
static const gchar *query1 = "[E]xit, [H]alt"; static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace"; static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed"; static const gchar *query3 = " or [P]roceed";
...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name) ...@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
} }
else else
goto retry; 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 void
......
...@@ -353,6 +353,8 @@ EXPORTS ...@@ -353,6 +353,8 @@ EXPORTS
g_str_equal g_str_equal
g_str_hash g_str_hash
g_strcasecmp g_strcasecmp
g_strchomp
g_strchug
g_strconcat g_strconcat
g_strdelimit g_strdelimit
g_strdown g_strdown
......
...@@ -7,22 +7,28 @@ BIN = C:\bin ...@@ -7,22 +7,28 @@ BIN = C:\bin
# This is the location of pthreads for Win32, # This is the location of pthreads for Win32,
# see http://sourceware.cygnus.com/pthreads-win32/ # see http://sourceware.cygnus.com/pthreads-win32/
# We want the 1999-04-07 snapshot.
PTHREADS = ..\pthreads-snap-1999-04-07 PTHREADS = ..\pthreads-snap-1999-04-07
PTHREAD_LIB = $(PTHREADS)\pthread.lib PTHREAD_LIB = $(PTHREADS)\pthread.lib
PTHREAD_INC = -I $(PTHREADS) PTHREAD_INC = -I $(PTHREADS)
# Full optimization:
OPTIMIZE = -Ox
# Debugging:
#OPTIMIZE = -Zi
################################################################ ################################################################
# Nothing much configurable below # 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 INSTALL = copy
GLIB_VER = 1.3 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
CFLAGS = -I. -DHAVE_CONFIG_H CFLAGS = -I. -DHAVE_CONFIG_H
......
...@@ -97,9 +97,9 @@ typedef unsigned long long guint64; ...@@ -97,9 +97,9 @@ typedef unsigned long long guint64;
#define alloca _alloca #define alloca _alloca
#endif #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 #ifdef __cplusplus
#define G_HAVE_INLINE 1 #define G_HAVE_INLINE 1
...@@ -119,7 +119,7 @@ typedef unsigned long long guint64; ...@@ -119,7 +119,7 @@ typedef unsigned long long guint64;
* printf ("sizeof (pthread_mutex_t) = %d\n", sizeof (pthread_mutex_t)); * printf ("sizeof (pthread_mutex_t) = %d\n", sizeof (pthread_mutex_t));
* printf ("PTHREAD_MUTEX_INITIALIZER = "); * printf ("PTHREAD_MUTEX_INITIALIZER = ");
* for (i = 0; i < sizeof (pthread_mutex_t); i++) * for (i = 0; i < sizeof (pthread_mutex_t); i++)
* printf ("%u, ", (unsigned) ((unsigned char *) &m)[i]); * printf ("%u, ", ((unsigned char *) &m)[i]);
* printf ("\n"); * printf ("\n");
* exit(0); * exit(0);
* } * }
......
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> Sat May 1 10:58:57 PDT 1999 Manish Singh <yosh@gimp.org>
* Makefile.am: use -avoid-version and -module for test plugins * Makefile.am: use -avoid-version and -module for test plugins
......
...@@ -170,17 +170,6 @@ _g_module_build_path (const gchar *directory, ...@@ -170,17 +170,6 @@ _g_module_build_path (const gchar *directory,
} }
#endif /* no implementation */ #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 --- */ /* --- functions --- */
gboolean gboolean
g_module_supported (void) g_module_supported (void)
......
...@@ -8,6 +8,7 @@ BIN = /bin ...@@ -8,6 +8,7 @@ BIN = /bin
# This is the location of pthreads for Win32, # This is the location of pthreads for Win32,
# see http://sourceware.cygnus.com/pthreads-win32/ # see http://sourceware.cygnus.com/pthreads-win32/
# We want the 1999-04-07 snapshot.
PTHREADS = ../pthreads-snap-1999-04-07 PTHREADS = ../pthreads-snap-1999-04-07
PTHREAD_LIB = -L$(PTHREADS) -lpthread PTHREAD_LIB = -L$(PTHREADS) -lpthread
PTHREAD_INC = -I $(PTHREADS) PTHREAD_INC = -I $(PTHREADS)
...@@ -25,7 +26,7 @@ LD = ld ...@@ -25,7 +26,7 @@ LD = ld
DLLTOOL = dlltool DLLTOOL = dlltool
INSTALL = install INSTALL = install
GLIB_VER = 1.3 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
CFLAGS = $(OPTIMIZE) -I. -DHAVE_CONFIG_H CFLAGS = $(OPTIMIZE) -I. -DHAVE_CONFIG_H
......
## 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 \