diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-10-29 07:06:37 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-10-29 07:06:37 +0000 |
| commit | 06b4ef65174e56e766e4bde06e08e34c08788272 (patch) | |
| tree | fb33492b545ea2f73cd901c6ccbbf2d86111dee0 /gtk/gtkprivate.h | |
| parent | a53f14a6e3574e397d712f42638adb79a8b72104 (diff) | |
| download | gtk+-06b4ef65174e56e766e4bde06e08e34c08788272.tar.gz | |
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
Diffstat (limited to 'gtk/gtkprivate.h')
| -rw-r--r-- | gtk/gtkprivate.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index 66943590c3..0de6707cf7 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -74,9 +74,26 @@ typedef enum #define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END #define GTK_PRIVATE_UNSET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END +#ifdef G_OS_WIN32 + +const gchar *_gtk_get_libdir (); +const gchar *_gtk_get_sysconfdir (); +const gchar *_gtk_get_localedir (); +const gchar *_gtk_get_data_prefix (); + +#undef GTK_LIBDIR +#define GTK_LIBDIR _gtk_get_libdir () +#undef GTK_LOCALEDIR +#define GTK_LOCALEDIR _gtk_get_localedir () +#undef GTK_SYSCONFDIR +#define GTK_SYSCONFDIR _gtk_get_sysconfdir () +#undef GTK_DATA_PREFIX +#define GTK_DATA_PREFIX _gtk_get_data_prefix () + +#endif /* G_OS_WIN32 */ + #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __GTK_PRIVATE_H__ */ |