luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure.in glibconfig.h.win32.in Revert my changes for static build for

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

	* configure.in
	* glibconfig.h.win32.in
	* glib/gutils.c: Revert my changes for static build for Win32
	from 2008-04-03--04. They were not complete and it's not
	apropriate to do changes like that in the stable branch anyway. I
	will continue that effort in trunk.


svn path=/branches/glib-2-16/; revision=6849
This commit is contained in:
Tor Lillqvist
2008-04-11 15:28:53 +00:00
committed by Tor Lillqvist
parent 7faf0095ff
commit 0c7c9f0c1d
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2008-04-11 Tor Lillqvist <tml@novell.com>
* configure.in
* glibconfig.h.win32.in
* glib/gutils.c: Revert my changes for static build for Win32
from 2008-04-03--04. They were not complete and it's not
apropriate to do changes like that in the stable branch anyway. I
will continue that effort in trunk.
2008-04-09 Federico Mena Quintero <federico@novell.com> 2008-04-09 Federico Mena Quintero <federico@novell.com>
Merged from trunk: Merged from trunk:

27
configure.in
View File

@@ -250,6 +250,17 @@ else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
fi 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. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
@@ -500,17 +511,6 @@ if test "x$GCC" = "xyes"; then
esac esac
fi fi
if test "$glib_native_win32" = "yes"; then
if test x$enable_static = xyes -a x$enable_shared = xyes; then
AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])
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
dnl dnl
dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R) dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
dnl dnl
@@ -2721,7 +2721,6 @@ $glib_atexit
$glib_memmove $glib_memmove
$glib_defines $glib_defines
$glib_os $glib_os
$glib_static_compilation
$glib_vacopy $glib_vacopy
@@ -3200,10 +3199,6 @@ case $host in
glib_os="#define G_OS_UNIX" glib_os="#define G_OS_UNIX"
;; ;;
esac esac
glib_static_compilation=""
if test x$glib_win32_static_compilation = xyes; then
glib_static_compilation="#define GLIB_STATIC_COMPILATION 1"
fi
]) ])
AC_CONFIG_FILES([ AC_CONFIG_FILES([

10
glib/gutils.c
View File

@@ -134,8 +134,6 @@ const guint glib_binary_age = GLIB_BINARY_AGE;
static HMODULE glib_dll = NULL; static HMODULE glib_dll = NULL;
#ifdef DLL_EXPORT
BOOL WINAPI BOOL WINAPI
DllMain (HINSTANCE hinstDLL, DllMain (HINSTANCE hinstDLL,
DWORD fdwReason, DWORD fdwReason,
@@ -147,18 +145,12 @@ DllMain (HINSTANCE hinstDLL,
return TRUE; return TRUE;
} }
#endif
gchar * gchar *
_glib_get_installation_directory (void) _glib_get_installation_directory (void)
{ {
#ifdef DLL_EXPORT
if (glib_dll == NULL) if (glib_dll == NULL)
return NULL; return NULL;
#endif
/* In a static build of GLib just use the application's .exe file's
* installation directory...
*/
return g_win32_get_package_installation_directory_of_module (glib_dll); return g_win32_get_package_installation_directory_of_module (glib_dll);
} }

1
glibconfig.h.win32.in
View File

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