mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-07-24 02:47:52 +02:00
Don't distribute glibconfig.h.win32.in, but glibconfig.h.win32. Generate
* Makefile.am: Don't distribute glibconfig.h.win32.in, but glibconfig.h.win32. Generate it when making a dist. Also generate makefile.msc and config.h.win32 from corresponding .in files when making dist. * configure.in: Also substitute @GLIB_INTERFACE_AGE@ and @GLIB_BINARY_AGE@ (needed in config.h.win32). * glibconfig.h.win32.in: Use static mutex structure and initial value corresponding to the 1999-04-07 snapshot of pthreads-win32. * tests/Makefile.am: Distribute makefile.msc. Generate it when making dist. * tests/makefile.msc.in: New file. * tests/node-test.c: Include <stdlib.h> for exit().
This commit is contained in:
Tor Lillqvist
20
ChangeLog
20
ChangeLog
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
@@ -1,3 +1,23 @@
|
||||
1999-04-30 Tor Lillqvist <tml@localhost.localdomain>
|
||||
|
||||
* Makefile.am: Don't distribute glibconfig.h.win32.in, but
|
||||
glibconfig.h.win32. Generate it when making a dist. Also generate
|
||||
makefile.msc and config.h.win32 from corresponding .in files when
|
||||
making dist.
|
||||
|
||||
* configure.in: Also substitute @GLIB_INTERFACE_AGE@ and
|
||||
@GLIB_BINARY_AGE@ (needed in config.h.win32).
|
||||
|
||||
* glibconfig.h.win32.in: Use static mutex structure and initial
|
||||
value corresponding to the 1999-04-07 snapshot of pthreads-win32.
|
||||
|
||||
* tests/Makefile.am: Distribute makefile.msc. Generate it when
|
||||
making dist.
|
||||
|
||||
* tests/makefile.msc.in: New file.
|
||||
|
||||
* tests/node-test.c: Include <stdlib.h> for exit().
|
||||
|
||||
Thu Apr 29 02:16:36 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gstrfuncs.c: minor code cleanups.
|
||||
|
||||
11
Makefile.am
11
Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
|
||||
glib.def \
|
||||
makefile.msc \
|
||||
giowin32.c \
|
||||
glibconfig.h.win32.in \
|
||||
glibconfig.h.win32 \
|
||||
config.h.win32
|
||||
|
||||
lib_LTLIBRARIES = libglib.la
|
||||
@@ -80,6 +80,15 @@ 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
|
||||
|
||||
.PHONY: files release sanity snapshot
|
||||
|
||||
files:
|
||||
|
||||
@@ -10,9 +10,9 @@ and tools. Both the compiler from MSVC 5.0 and MSVC 6.0 have been used
|
||||
successfully.
|
||||
|
||||
Before building you must get the pthreads library for Windows from
|
||||
http://sourceware.cygnus.com/pthreads-win32/. Edit the location of the
|
||||
pthreads library and include files in makefile.msc. Also edit the BIN
|
||||
definition in makefile.msc.
|
||||
http://sourceware.cygnus.com/pthreads-win32/. We want the 1999-04-07
|
||||
release. Edit the location of the pthreads library and include files
|
||||
in makefile.msc. Also edit the BIN definition in makefile.msc.
|
||||
|
||||
Build with `nmake -f makefile.msc`. Install with `nmake -f
|
||||
makefile.msc install`.
|
||||
|
||||
@@ -1,139 +1,139 @@
|
||||
/* config.h.win32. Handcrafted for Microsoft C */
|
||||
|
||||
/* Define to empty if the keyword does not work. */
|
||||
/* #undef const */
|
||||
|
||||
/* Define if you don't have vprintf but do have _doprnt. */
|
||||
/* #undef HAVE_DOPRNT */
|
||||
|
||||
/* Define if you have <unistd.h>. */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
|
||||
/* Define if you have the vprintf function. */
|
||||
#define HAVE_VPRINTF 1
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Define if your processor stores words with the most significant
|
||||
byte first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
/* #undef WORDS_BIGENDIAN */
|
||||
|
||||
/* #undef ENABLE_MEM_CHECK */
|
||||
/* #undef ENABLE_MEM_PROFILE */
|
||||
|
||||
#define G_COMPILED_WITH_DEBUGGING "minimum"
|
||||
|
||||
/* #undef HAVE_BROKEN_WCTYPE */
|
||||
/* #undef HAVE_DOPRNT */
|
||||
#define HAVE_FLOAT_H 1
|
||||
#define HAVE_LIMITS_H 1
|
||||
/* #undef HAVE_LOCALTIME_R */
|
||||
/* #undef HAVE_LONG_DOUBLE */
|
||||
/* #undef HAVE_POLL */
|
||||
/* #undef HAVE_PWD_H */
|
||||
/* #undef HAVE_SYS_PARAM_H */
|
||||
/* #undef HAVE_SYS_POLL_H */
|
||||
/* #undef HAVE_SYS_SELECT_H */
|
||||
/* #undef HAVE_SYS_TIME_H */
|
||||
/* #undef HAVE_SYS_TIMES_H */
|
||||
#define HAVE_STRERROR 1
|
||||
/* #undef HAVE_STRSIGNAL */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
/* #undef HAVE_VSNPRINTF */
|
||||
/* #undef HAVE_VALUES_H */
|
||||
#define HAVE_VPRINTF 1
|
||||
#define HAVE_WCHAR_H 1
|
||||
#define HAVE_WCTYPE_H 1
|
||||
|
||||
/* #undef NO_FD_SET */
|
||||
/* #undef NO_SYS_ERRLIST */
|
||||
#define NO_SYS_SIGLIST 1
|
||||
|
||||
/* #undef G_VA_COPY */
|
||||
/* #undef G_VA_COPY_AS_ARRAY */
|
||||
#define G_HAVE___INLINE 1
|
||||
|
||||
#define GLIB_MAJOR_VERSION 1
|
||||
#define GLIB_MINOR_VERSION 2
|
||||
#define GLIB_MICRO_VERSION 0
|
||||
#define GLIB_INTERFACE_AGE 0
|
||||
#define GLIB_BINARY_AGE 0
|
||||
|
||||
#define G_THREAD_SOURCE "gthread-posix.c"
|
||||
#define HAVE_PTHREAD_COND_TIMEDWAIT_POSIX 1
|
||||
#define HAVE_PTHREAD_GETSPECIFIC_POSIX 1
|
||||
#define HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX 1
|
||||
|
||||
/* The number of bytes in a char. */
|
||||
#define SIZEOF_CHAR 1
|
||||
|
||||
/* The number of bytes in a int. */
|
||||
#define SIZEOF_INT 4
|
||||
|
||||
/* The number of bytes in a long. */
|
||||
#define SIZEOF_LONG 4
|
||||
|
||||
/* The number of bytes in a long long. */
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
|
||||
/* The number of bytes in a short. */
|
||||
#define SIZEOF_SHORT 2
|
||||
|
||||
/* The number of bytes in a void *. */
|
||||
#define SIZEOF_VOID_P 4
|
||||
|
||||
/* Define if you have the atexit function. */
|
||||
#define HAVE_ATEXIT 1
|
||||
|
||||
/* Define if you have the lstat function. */
|
||||
/* #undef HAVE_LSTAT */
|
||||
|
||||
/* Define if you have the memmove function. */
|
||||
#define HAVE_MEMMOVE 1
|
||||
|
||||
/* Define if you have the on_exit function. */
|
||||
/* #undef HAVE_ON_EXIT */
|
||||
|
||||
/* Define if you have the strcasecmp function. */
|
||||
/* #undef HAVE_STRCASECMP ^*/
|
||||
|
||||
/* Define if you have the strerror function. */
|
||||
#define HAVE_STRERROR 1
|
||||
|
||||
/* Define if you have the strsignal function. */
|
||||
/* #undef HAVE_STRSIGNAL */
|
||||
|
||||
/* Define if you have the vsnprintf function. */
|
||||
/* #undef HAVE_VSNPRINTF */
|
||||
|
||||
/* Define if you have the <float.h> header file. */
|
||||
#define HAVE_FLOAT_H 1
|
||||
|
||||
/* Define if you have the <limits.h> header file. */
|
||||
#define HAVE_LIMITS_H 1
|
||||
|
||||
/* Define if you have the <pwd.h> header file. */
|
||||
/* #undef HAVE_PWD_H */
|
||||
|
||||
/* Define if you have the <sys/param.h> header file. */
|
||||
/* #undef HAVE_SYS_PARAM_H */
|
||||
|
||||
/* Define if you have the <sys/select.h> header file. */
|
||||
/* #undef HAVE_SYS_SELECT_H */
|
||||
|
||||
/* Define if you have the <sys/time.h> header file. */
|
||||
/* #undef HAVE_SYS_TIME_H */
|
||||
|
||||
/* Define if you have the <sys/times.h> header file. */
|
||||
/* #undef HAVE_SYS_TIMES_H */
|
||||
|
||||
/* Define if you have the <unistd.h> header file. */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
|
||||
/* Define if you have the <values.h> header file. */
|
||||
/* #undef HAVE_VALUES_H */
|
||||
|
||||
/* Define if you have the w library (-lw). */
|
||||
/* #undef HAVE_LIBW */
|
||||
|
||||
/* config.h.win32. Handcrafted for Microsoft C */
|
||||
|
||||
/* Define to empty if the keyword does not work. */
|
||||
/* #undef const */
|
||||
|
||||
/* Define if you don't have vprintf but do have _doprnt. */
|
||||
/* #undef HAVE_DOPRNT */
|
||||
|
||||
/* Define if you have <unistd.h>. */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
|
||||
/* Define if you have the vprintf function. */
|
||||
#define HAVE_VPRINTF 1
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Define if your processor stores words with the most significant
|
||||
byte first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
/* #undef WORDS_BIGENDIAN */
|
||||
|
||||
/* #undef ENABLE_MEM_CHECK */
|
||||
/* #undef ENABLE_MEM_PROFILE */
|
||||
|
||||
#define G_COMPILED_WITH_DEBUGGING "minimum"
|
||||
|
||||
/* #undef HAVE_BROKEN_WCTYPE */
|
||||
/* #undef HAVE_DOPRNT */
|
||||
#define HAVE_FLOAT_H 1
|
||||
#define HAVE_LIMITS_H 1
|
||||
/* #undef HAVE_LOCALTIME_R */
|
||||
/* #undef HAVE_LONG_DOUBLE */
|
||||
/* #undef HAVE_POLL */
|
||||
/* #undef HAVE_PWD_H */
|
||||
/* #undef HAVE_SYS_PARAM_H */
|
||||
/* #undef HAVE_SYS_POLL_H */
|
||||
/* #undef HAVE_SYS_SELECT_H */
|
||||
/* #undef HAVE_SYS_TIME_H */
|
||||
/* #undef HAVE_SYS_TIMES_H */
|
||||
#define HAVE_STRERROR 1
|
||||
/* #undef HAVE_STRSIGNAL */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
/* #undef HAVE_VSNPRINTF */
|
||||
/* #undef HAVE_VALUES_H */
|
||||
#define HAVE_VPRINTF 1
|
||||
#define HAVE_WCHAR_H 1
|
||||
#define HAVE_WCTYPE_H 1
|
||||
|
||||
/* #undef NO_FD_SET */
|
||||
/* #undef NO_SYS_ERRLIST */
|
||||
#define NO_SYS_SIGLIST 1
|
||||
|
||||
/* #undef G_VA_COPY */
|
||||
/* #undef G_VA_COPY_AS_ARRAY */
|
||||
#define G_HAVE___INLINE 1
|
||||
|
||||
#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
|
||||
#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
|
||||
#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
|
||||
#define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@
|
||||
#define GLIB_BINARY_AGE @GLIB_BINARY_AGE@
|
||||
|
||||
#define G_THREAD_SOURCE "gthread-posix.c"
|
||||
#define HAVE_PTHREAD_COND_TIMEDWAIT_POSIX 1
|
||||
#define HAVE_PTHREAD_GETSPECIFIC_POSIX 1
|
||||
#define HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX 1
|
||||
|
||||
/* The number of bytes in a char. */
|
||||
#define SIZEOF_CHAR 1
|
||||
|
||||
/* The number of bytes in a int. */
|
||||
#define SIZEOF_INT 4
|
||||
|
||||
/* The number of bytes in a long. */
|
||||
#define SIZEOF_LONG 4
|
||||
|
||||
/* The number of bytes in a long long. */
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
|
||||
/* The number of bytes in a short. */
|
||||
#define SIZEOF_SHORT 2
|
||||
|
||||
/* The number of bytes in a void *. */
|
||||
#define SIZEOF_VOID_P 4
|
||||
|
||||
/* Define if you have the atexit function. */
|
||||
#define HAVE_ATEXIT 1
|
||||
|
||||
/* Define if you have the lstat function. */
|
||||
/* #undef HAVE_LSTAT */
|
||||
|
||||
/* Define if you have the memmove function. */
|
||||
#define HAVE_MEMMOVE 1
|
||||
|
||||
/* Define if you have the on_exit function. */
|
||||
/* #undef HAVE_ON_EXIT */
|
||||
|
||||
/* Define if you have the strcasecmp function. */
|
||||
/* #undef HAVE_STRCASECMP ^*/
|
||||
|
||||
/* Define if you have the strerror function. */
|
||||
#define HAVE_STRERROR 1
|
||||
|
||||
/* Define if you have the strsignal function. */
|
||||
/* #undef HAVE_STRSIGNAL */
|
||||
|
||||
/* Define if you have the vsnprintf function. */
|
||||
/* #undef HAVE_VSNPRINTF */
|
||||
|
||||
/* Define if you have the <float.h> header file. */
|
||||
#define HAVE_FLOAT_H 1
|
||||
|
||||
/* Define if you have the <limits.h> header file. */
|
||||
#define HAVE_LIMITS_H 1
|
||||
|
||||
/* Define if you have the <pwd.h> header file. */
|
||||
/* #undef HAVE_PWD_H */
|
||||
|
||||
/* Define if you have the <sys/param.h> header file. */
|
||||
/* #undef HAVE_SYS_PARAM_H */
|
||||
|
||||
/* Define if you have the <sys/select.h> header file. */
|
||||
/* #undef HAVE_SYS_SELECT_H */
|
||||
|
||||
/* Define if you have the <sys/time.h> header file. */
|
||||
/* #undef HAVE_SYS_TIME_H */
|
||||
|
||||
/* Define if you have the <sys/times.h> header file. */
|
||||
/* #undef HAVE_SYS_TIMES_H */
|
||||
|
||||
/* Define if you have the <unistd.h> header file. */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
|
||||
/* Define if you have the <values.h> header file. */
|
||||
/* #undef HAVE_VALUES_H */
|
||||
|
||||
/* Define if you have the w library (-lw). */
|
||||
/* #undef HAVE_LIBW */
|
||||
|
||||
@@ -44,6 +44,8 @@ AC_SUBST(GLIB_MAJOR_VERSION)
|
||||
AC_SUBST(GLIB_MINOR_VERSION)
|
||||
AC_SUBST(GLIB_MICRO_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
|
||||
@@ -1292,7 +1294,6 @@ g_mutex_contents="$glib_cv_byte_contents_gmutex"
|
||||
|
||||
AC_OUTPUT([
|
||||
glib.spec
|
||||
glibconfig.h.win32
|
||||
Makefile
|
||||
glib-config
|
||||
gmodule/gmoduleconf.h
|
||||
|
||||
@@ -21,7 +21,7 @@ EXTRA_DIST = \
|
||||
glib.def \
|
||||
makefile.msc \
|
||||
giowin32.c \
|
||||
glibconfig.h.win32.in \
|
||||
glibconfig.h.win32 \
|
||||
config.h.win32
|
||||
|
||||
lib_LTLIBRARIES = libglib.la
|
||||
@@ -80,6 +80,15 @@ 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
|
||||
|
||||
.PHONY: files release sanity snapshot
|
||||
|
||||
files:
|
||||
|
||||
@@ -7,21 +7,23 @@ BIN = C:\bin
|
||||
|
||||
# This is the location of pthreads for Win32,
|
||||
# see http://sourceware.cygnus.com/pthreads-win32/
|
||||
PTHREAD_LIB = ..\lib\pthread.lib
|
||||
PTHREAD_INC = ..\include
|
||||
# We want the 1999-04-07 snapshot.
|
||||
PTHREADS = ..\pthreads-snap-1999-04-07
|
||||
PTHREAD_LIB = $(PTHREADS)\pthread.lib
|
||||
PTHREAD_INC = -I$(PTHREADS)
|
||||
|
||||
################################################################
|
||||
|
||||
# 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
|
||||
INSTALL = copy
|
||||
|
||||
GLIB_VER = 1.2
|
||||
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
|
||||
CFLAGS = -I. -DHAVE_CONFIG_H
|
||||
|
||||
@@ -101,7 +103,7 @@ gthread-$(GLIB_VER).dll : $(gthread_OBJECTS)
|
||||
$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gthread\gthread.def
|
||||
|
||||
gthread.obj : gthread\gthread.c gthread\gthread-posix.c
|
||||
$(CC) $(CFLAGS) -GD -I$(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread.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
|
||||
@@ -143,7 +145,7 @@ 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) -I$(PTHREAD_INC) -c gthread\testgthread.c
|
||||
$(CC) $(CFLAGS) $(PTHREAD_INC) -c gthread\testgthread.c
|
||||
|
||||
clean:
|
||||
del config.h
|
||||
@@ -98,7 +98,7 @@ typedef unsigned __int64 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) ((char *) &m)[i]);
|
||||
* printf ("%u, ", ((unsigned char *) &m)[i]);
|
||||
* printf ("\n");
|
||||
* exit(0);
|
||||
* }
|
||||
@@ -111,15 +111,15 @@ struct _GStaticMutex
|
||||
struct _GMutex *runtime_mutex;
|
||||
union {
|
||||
/* The size of the pad array should be sizeof (pthread_mutext_t) */
|
||||
/* This value corresponds to the 1999-01-24 version of pthreads-win32 */
|
||||
char pad[36];
|
||||
/* This value corresponds to the 1999-04-07 version of pthreads-win32 */
|
||||
char pad[4];
|
||||
double dummy_double;
|
||||
void *dummy_pointer;
|
||||
long dummy_long;
|
||||
} aligned_pad_u;
|
||||
};
|
||||
/* This should be NULL followed by the bytes in PTHREAD_MUTEX_INITIALIZER */
|
||||
#define G_STATIC_MUTEX_INIT { NULL, { { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }
|
||||
#define G_STATIC_MUTEX_INIT { NULL, { { 255, 255, 255, 255 } } }
|
||||
#define g_static_mutex_get_mutex(mutex) \
|
||||
(g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
|
||||
g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
|
||||
|
||||
165
makefile.msc.in
Normal file
165
makefile.msc.in
Normal file
@@ -0,0 +1,165 @@
|
||||
## 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)
|
||||
|
||||
################################################################
|
||||
|
||||
# Nothing much configurable below
|
||||
|
||||
# cl -? describes the options
|
||||
CC = cl -G5 -GF -Ox -W3 -MD -nologo
|
||||
|
||||
# No general LDFLAGS needed
|
||||
LDFLAGS = /link
|
||||
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 \
|
||||
gslist.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)
|
||||
$(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)
|
||||
$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) glib-$(GLIB_VER).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
|
||||
@@ -1,6 +1,9 @@
|
||||
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
|
||||
EXTRA_DIST = \
|
||||
makefile.msc
|
||||
|
||||
TESTS = \
|
||||
array-test \
|
||||
dirname-test \
|
||||
@@ -28,3 +31,5 @@ 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
|
||||
|
||||
49
tests/makefile.msc.in
Normal file
49
tests/makefile.msc.in
Normal file
@@ -0,0 +1,49 @@
|
||||
## Makefile for building the GLib test programs with Microsoft C
|
||||
## Use: nmake -f makefile.msc check
|
||||
|
||||
################################################################
|
||||
|
||||
# Nothing much configurable below
|
||||
|
||||
# cl -? describes the options
|
||||
CC = cl -G5 -GF -Ox -W3 -MD -nologo
|
||||
|
||||
# No general LDFLAGS needed
|
||||
LDFLAGS = /link
|
||||
|
||||
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
|
||||
CFLAGS = -I.. -DHAVE_CONFIG_H
|
||||
|
||||
TESTS = \
|
||||
array-test.exe \
|
||||
dirname-test.exe\
|
||||
hash-test.exe \
|
||||
list-test.exe \
|
||||
node-test.exe \
|
||||
relation-test.exe\
|
||||
slist-test.exe \
|
||||
string-test.exe \
|
||||
strfunc-test.exe\
|
||||
tree-test.exe \
|
||||
type-test.exe
|
||||
|
||||
all : $(TESTS)
|
||||
|
||||
.c.exe :
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
$(CC) $(CFLAGS) -Fe$@ $< ..\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
|
||||
check: all
|
||||
for %p in ($(TESTS)) do %p
|
||||
|
||||
clean:
|
||||
del *.exe
|
||||
del *.obj
|
||||
del *.dll
|
||||
del *.lib
|
||||
del *.err
|
||||
del *.map
|
||||
del *.sym
|
||||
del *.exp
|
||||
del *.pdb
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
|
||||
Reference in New Issue
Block a user