mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-09-07 16:38:43 +02:00
Force shared library (DLL) only on Windows. (I don't think that is
2003-10-24 Tor Lillqvist <tml@iki.fi> * configure.in: Force shared library (DLL) only on Windows. (I don't think that is controversial?) Remove unnecessary AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on Win32, it is not used by mingw or MSVC headers. * config.h.win32.in * glibconfig.h.win32.in: Match what configure produces. * glib/gconvert.c * glib/gutils.c: Mark a couple of functions and variables that aren't public as static. * glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining it potentially differently, to silence compiler. * glib/glib.def: Add some missing entries. * tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after libtestgobject. * tests/gobject/ifaceproperties.c (main): NULL-terminate arg list to g_object_set() and _get().
This commit is contained in:
committed by
Tor Lillqvist
parent
dfa8c540a1
commit
5d097b8591
16
configure.in
16
configure.in
@@ -215,6 +215,17 @@ else
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
|
||||
if test "$glib_native_win32" = "yes"; then
|
||||
if test x$enable_static = xyes -o x$enable_static = x; then
|
||||
AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
|
||||
enable_static=no
|
||||
fi
|
||||
if test x$enable_shared = xno; then
|
||||
AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
|
||||
fi
|
||||
enable_shared=yes
|
||||
fi
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
|
||||
@@ -410,7 +421,6 @@ esac
|
||||
|
||||
dnl Initialize libtool
|
||||
AM_DISABLE_STATIC
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
if test "x$GCC" = "xyes"; then
|
||||
@@ -1466,6 +1476,10 @@ if test x"$have_threads" != xno; then
|
||||
G_THREAD_CFLAGS="-Kthread"
|
||||
G_THREAD_LIBS=$G_THREAD_CFLAGS
|
||||
;;
|
||||
*-mingw*)
|
||||
# No flag needed when using MSVCRT.DLL
|
||||
G_THREAD_CFLAGS=""
|
||||
;;
|
||||
*)
|
||||
G_THREAD_CFLAGS="-D_REENTRANT" # good default guess otherwise
|
||||
;;
|
||||
|
Reference in New Issue
Block a user