Define GLIB_STATIC_COMPILATION here also, if needed.

2008-04-04  Tor Lillqvist  <tml@novell.com>

	* glibconfig.h.win32.in: Define GLIB_STATIC_COMPILATION here also,
	if needed.


svn path=/trunk/; revision=6822
This commit is contained in:
Tor Lillqvist 2008-04-03 22:43:31 +00:00 committed by Tor Lillqvist
parent b79b3be6df
commit e2bcb1d1a6
3 changed files with 6 additions and 0 deletions

View File

@ -11,6 +11,9 @@
force the developer who compiles against a statically built GLib
to use -DGLIB_STATIC_COMPILATION.
* glibconfig.h.win32.in: Define GLIB_STATIC_COMPILATION here also,
if needed.
2008-04-03 Tor Lillqvist <tml@novell.com>
* configure.in: Don't enforce shared library build only on

View File

@ -491,6 +491,8 @@ if test "$glib_native_win32" = "yes"; then
fi
if test x$enable_static = xyes; then
glib_win32_static_compilation=yes
GLIB_WIN32_STATIC_COMPILATION_DEFINE="#define GLIB_STATIC_COMPILATION 1"
AC_SUBST(GLIB_WIN32_STATIC_COMPILATION_DEFINE)
fi
fi

View File

@ -103,6 +103,7 @@ typedef gint64 goffset;
#define G_OS_WIN32
#define G_PLATFORM_WIN32
@GLIB_WIN32_STATIC_COMPILATION_DEFINE@
#ifndef _MSC_VER
#define G_VA_COPY va_copy