mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-11 15:06:14 +01:00
updated for win32 msvc build
This commit is contained in:
parent
f1b60091b9
commit
d1a05f990e
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
@ -1,3 +1,16 @@
|
||||
2001-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib.def, gobject/gobject.def : added nissing symbols
|
||||
|
||||
* gobject/makefile.msc : updated
|
||||
|
||||
* glib/gmessages.c : call the "debug interrupt" before exiting the
|
||||
program, if build with msvc as debug version. Which gives the opportunity
|
||||
to see the callstack, etc.
|
||||
|
||||
* glib/gthread.c : thread->pid is only defined #ifdef
|
||||
G_THREAD_USE_PID_SURROGATE
|
||||
|
||||
Mon Feb 19 07:32:38 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib-config-2.0.in (lib_glib): my name is glib-config-2.0!
|
||||
|
2
glib.def
2
glib.def
@ -555,6 +555,8 @@ EXPORTS
|
||||
g_tree_remove
|
||||
g_tree_search
|
||||
g_tree_traverse
|
||||
g_try_malloc
|
||||
g_try_realloc
|
||||
g_tuples_destroy
|
||||
g_tuples_index
|
||||
g_ucs4_to_utf16
|
||||
|
@ -555,6 +555,8 @@ EXPORTS
|
||||
g_tree_remove
|
||||
g_tree_search
|
||||
g_tree_traverse
|
||||
g_try_malloc
|
||||
g_try_realloc
|
||||
g_tuples_destroy
|
||||
g_tuples_index
|
||||
g_ucs4_to_utf16
|
||||
|
@ -435,6 +435,10 @@ g_logv (const gchar *log_domain,
|
||||
#ifdef G_OS_WIN32
|
||||
MessageBox (NULL, fatal_msg_buf, NULL, MB_OK);
|
||||
#endif
|
||||
# if defined (_MSC_VER) && defined (_DEBUG)
|
||||
/* let's see the call stack ... */
|
||||
__asm int 3
|
||||
# endif
|
||||
abort ();
|
||||
#endif /* !G_ENABLE_DEBUG || !SIGTRAP */
|
||||
}
|
||||
|
@ -522,8 +522,10 @@ g_thread_create_proxy (gpointer data)
|
||||
G_LOCK (g_thread);
|
||||
G_UNLOCK (g_thread);
|
||||
|
||||
#ifdef G_THREAD_USE_PID_SURROGATE
|
||||
if (g_thread_use_default_impl)
|
||||
SET_PRIO (thread->pid, thread->thread.priority);
|
||||
#endif /* G_THREAD_USE_PID_SURROGATE */
|
||||
|
||||
thread->func (thread->arg);
|
||||
}
|
||||
|
@ -435,6 +435,10 @@ g_logv (const gchar *log_domain,
|
||||
#ifdef G_OS_WIN32
|
||||
MessageBox (NULL, fatal_msg_buf, NULL, MB_OK);
|
||||
#endif
|
||||
# if defined (_MSC_VER) && defined (_DEBUG)
|
||||
/* let's see the call stack ... */
|
||||
__asm int 3
|
||||
# endif
|
||||
abort ();
|
||||
#endif /* !G_ENABLE_DEBUG || !SIGTRAP */
|
||||
}
|
||||
|
@ -25,6 +25,7 @@ EXPORTS
|
||||
g_closure_remove_inotify
|
||||
g_closure_set_marshal
|
||||
g_closure_set_meta_marshal
|
||||
g_closure_sink
|
||||
g_closure_unref
|
||||
g_enum_complete_type_info
|
||||
g_enum_get_value
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
TOP = ..\..
|
||||
|
||||
!INCLUDE ..\build\win32\make.msc
|
||||
!INCLUDE $(TOP)\build\win32\make.msc
|
||||
|
||||
# Possibly override GLib version in build\win32\object.defs
|
||||
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
@ -34,6 +34,16 @@ gobject_OBJECTS = \
|
||||
gvalue.obj \
|
||||
gvaluetypes.obj
|
||||
|
||||
gmarshal.h : gmarshal.list glib-genmarshal.exe
|
||||
echo #ifndef __G_MARSHAL_H__ > xgen-gmh
|
||||
echo #define __G_MARSHAL_H__ >> xgen-gmh
|
||||
glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --header >> xgen-gmh
|
||||
echo #endif /* __G_MARSHAL_H__ */ >> xgen-gmh
|
||||
copy xgen-gmh gmarshal.h
|
||||
|
||||
gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
|
||||
glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
|
||||
|
||||
makefile.msc: makefile.msc.in
|
||||
$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
|
||||
-e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
|
||||
@ -42,8 +52,4 @@ gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
|
||||
$(CC) $(CFLAGS) -LD -Fegobject-$(GLIB_VER).dll $(gobject_OBJECTS) ..\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gobject.def
|
||||
|
||||
glib-genmarshal.exe : glib-genmarshal.c
|
||||
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib
|
||||
|
||||
# I don't even try to build gmarshal.c and gmarshal.h here. If you try
|
||||
# to build this from CVS with MSVC, you will have to have a look in
|
||||
# Makefile.am or makefile.mingw.in to see how to do it.
|
||||
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER).lib
|
||||
|
@ -522,8 +522,10 @@ g_thread_create_proxy (gpointer data)
|
||||
G_LOCK (g_thread);
|
||||
G_UNLOCK (g_thread);
|
||||
|
||||
#ifdef G_THREAD_USE_PID_SURROGATE
|
||||
if (g_thread_use_default_impl)
|
||||
SET_PRIO (thread->pid, thread->thread.priority);
|
||||
#endif /* G_THREAD_USE_PID_SURROGATE */
|
||||
|
||||
thread->func (thread->arg);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user