luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-03 12:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add variable for LT_CURRENT minus LT_AGE (the suffix used by libtool on

Browse Source 
2001-09-17  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Add variable for LT_CURRENT minus LT_AGE (the
	suffix used by libtool on Win32 for DLLs). Set variables for the
	compiled resource files on Windows. Handle the native Win32
	gthread stuff.

	* glib/Makefile.am
	* gmodule/Makefile.am
	* gobject/Makefile.am: (Win32) Add minor hacks to link in the object
	file produced from the resource file. Use the lt-compile-resource
	script from the build module. The non-hack way would be to teach
	libtool, autoconf and automake about .rc files (which are a kind
	of source code, after all, that gets compiled to object
	files). But then there would be problems for those who wouldn't have
	bleeding edge auto* and libtool.

	* glib/glib.def
	* gobject/gobject.def: Updates.

	* glib/glib.rc.in
	* gmodule/gmodule.rc.in
	* gobject/gobject.rc.in
	* gthread/gthread.rc.in: Update InternalName and OriginalFilename to
	match libtool's naming convention for DLLs.

	* glib/gutils.c: Ditto when constructing the DLL name in the
	definition for GLIB_LOCALE_DIR.

	* glib/makefile.mingw.in
	* gmodule/makefile.mingw.in
	* gobject/makefile.mingw.in
	* gthread/makefile.mingw.in: Update import library names.
This commit is contained in:
Tor Lillqvist
2001-09-17 00:41:39 +00:00
committed by Tor Lillqvist
parent 545a6a7616
commit 020b44f5ac
24 changed files with 431 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gutils.c
View File

@@ -1092,11 +1092,13 @@ g_get_codeset (void)
#ifndef GLIB_LOCALE_DIR
#ifdef G_PLATFORM_WIN32
#define GLIB_LOCALE_DIR \
#define GLIB_LOCALE_DIR \
g_win32_get_package_installation_subdirectory \
(GETTEXT_PACKAGE, g_strdup_printf ("glib-%d.%d.dll", \
GLIB_MAJOR_VERSION, \
GLIB_MINOR_VERSION), \
(GETTEXT_PACKAGE, \
g_strdup_printf ("libglib-%d.%d-%d.dll", \
GLIB_MAJOR_VERSION, \
GLIB_MINOR_VERSION, \
GLIB_MICRO_VERSION - GLIB_BINARY_AGE), \
"locale")
#endif /* G_PLATFORM_WIN32 */