diff options
| author | Hans Breuer <hans@breuer.org> | 2001-11-09 21:52:52 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-11-09 21:52:52 +0000 |
| commit | be3809f0ba4a29729251df476471047606dbf3f2 (patch) | |
| tree | 49547b0f7c6ce34ee6fa22c77c115a6882f08625 /gdk/makefile.msc | |
| parent | 15d20507948e6a9f899a4443c722c5651d91e519 (diff) | |
| download | gtk+-be3809f0ba4a29729251df476471047606dbf3f2.tar.gz | |
use g_strcasecmp(), some poor platforms don't have strcasecmp()
2001-10-28 Hans Breuer <hans@breuer.org>
* gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms
don't have strcasecmp()
* gtk/gtktextview.c : to fix crashing on e.g. TextView::find need
to remove the idle funcs in gtk_text_view_destroy (). To reduce
code duplication wrap it in its own function and use it in
gtk_text_view_unrealize () and gtk_text_view_destroy_layout ()
* gdk/win32/gdkdrawable-win32.c : implement the finalize
method like the X11 version does, allow to set_colormap NULL
* gdk/win32/gdkwindow-win32.c : adapt GdkWindowImplWin32::
set_colormap, also some adaption to X11 version :
(gdk_window_hide) call _gdk_window_clear_update_area
(gdk_window_reparent) call _gdk_window_init_position
* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints) :
call gdk_window_resize() after all hints are set, because the
window resizing process (WM_GETMINMAXINFO) takes all of them into
account
* gdk/win32/gdkfont-win32.c : make gdk_font_equal return a gboolean
* gdk/win32/gdkvisual-win32.c : register GdkVisual with
sizeof (GdkVisualPrivate)
* gdk/gdk.def gtk/gtk.def : upated externals
* gdk/makefile.msc gdk/win32/makefile.msc gdk-pixbuf/makefile.msc
gdk-pixbuf/pixops/makefile.msc gtk/makefile.msc.in tests/makefile.msc :
from now on use make.msc from $(TOP)/glib/build/win32
* gtk/stock-icons/makefile.msc : add stock_missing_image
Diffstat (limited to 'gdk/makefile.msc')
| -rw-r--r-- | gdk/makefile.msc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gdk/makefile.msc b/gdk/makefile.msc index ecfa223377..544ae1bbd1 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -7,7 +7,7 @@ ## how to install for yourself. TOP = ../.. -!INCLUDE $(TOP)/build/win32/make.msc +!INCLUDE $(TOP)/glib/build/win32/make.msc # Location of the Wintab toolkit. Downloadable from http://www.pointing.com. # definition should possibly go to build/win32/module.def, too. @@ -41,7 +41,7 @@ PERL = perl !ENDIF CFLAGS = -I . -I .. $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \ - -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\" + $(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\" EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \ ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib $(PANGOWIN32_LIBS) @@ -57,7 +57,9 @@ all: \ gdkenumtypes.c \ gdk-win32-backend \ gdk-win32-$(GTK_VER).dll \ - testgdk.exe + testgdk.exe \ + gdk-win32-$(GTK_VER)s.lib \ +# gdk-x11-$(GTK_VER).dll \ gdk_OBJECTS = \ gdk.obj \ @@ -123,6 +125,14 @@ gdkconfig.h : gdkconfig.h.win32 gdk-win32-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib $(CC) $(CFLAGS) -LD -Fegdk-win32-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def +gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS) + lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib + +gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib + $(CC) $(CFLAGS) -LD -Fegdk-x11-$(GTK_VER).dll $(gdk_OBJECTS) \ + $(PANGO)\pango\pangox-$(PANGO_VER).lib \ + x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def + testgdk.exe : gdk-win32-$(GTK_VER).dll testgdk.obj $(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS) |