diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-10-09 19:49:42 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-10-09 19:49:42 +0000 |
| commit | 658b4b1da879a76328b779676b34c0c15b41596d (patch) | |
| tree | c585422c20b397cb79411b2d7e1ab34566118691 /gdk/win32/makefile.msc | |
| parent | ea708d50f289d7c1494c557596e8dd28b916187e (diff) | |
| download | gtk+-658b4b1da879a76328b779676b34c0c15b41596d.tar.gz | |
Update.
2000-10-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update.
* gdk/win32/gdkgeometry-win32.c (gdk_window_clip_changed): Add two
lines that had been deleted by mistake (?).
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): Handle
also the case fg==white and bg==black (but still not randomly
coloured cursors). Thanks to Wolfgang Sourdeau.
* gdk/win32/*.c: Silence gcc -Wall.
* gtk/gtk.def: Add missing entry points.
Fixes by Hans Breuer:
* gdk/makefile.msc
* gdk/win32/makefile.msc: Update.
* gdk/testgdk.c: If compiling with debugging (with _DEBUG defined,
some MSVC thing, presumably), cause breakpoint on failures. Add
GDK_NOR case. Call g_log_set_always_fatal.
* gdk/win32/gdkwin32id.c (gdk_win32_handle_table_insert): Handle
should be pased by reference.
* gdk/win32/gdkprivate-win32.h: Correct declaration accordingly.
* gdk/win32/*.c: Correct calls to gdk_win32_handle_table_insert.
* gdk/win32/gdkevents-win32.c
* gdk/win32/gdkwindow-win32.c: Handle WM_CREATE.
* gdk/win32/gdkgc-win32.c: Fix mixups of drawable and
implementation object.
* gdk/win32/gdkimage-win32.c (gdk_image_get): Handle drawables,
not just windows.
* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize):
Use the wrapper object.
Diffstat (limited to 'gdk/win32/makefile.msc')
| -rw-r--r-- | gdk/win32/makefile.msc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc index 5a853444c4..1b4bed3063 100644 --- a/gdk/win32/makefile.msc +++ b/gdk/win32/makefile.msc @@ -8,6 +8,9 @@ WTKIT = ..\..\..\wtkit126 # Nothing much configurable below +TOP = ../../.. +!INCLUDE $(TOP)/build/win32/make.msc + !IFNDEF DEBUG # Full optimization: OPTIMIZE = -Ox -MD @@ -21,11 +24,9 @@ CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo LDFLAGS = /link /machine:ix86 $(LINKDEBUG) -GLIB_VER=1.3 GTK_VER=1.3 -GLIB = ..\..\..\glib -CFLAGS = -I. -I.. -I..\.. -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" +CFLAGS = -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" all: \ ..\..\config.h \ @@ -46,11 +47,13 @@ gdk_win32_OBJECTS = \ gdkglobals-win32.obj \ gdkim-win32.obj \ gdkimage-win32.obj \ + gdkinput.obj \ gdkinput-win32.obj \ gdkmain-win32.obj \ + gdkpango-win32.obj \ gdkpixmap-win32.obj \ gdkproperty-win32.obj \ - gdkregion-win32.obj \ +# gdkregion-win32.obj \ gdkselection-win32.obj \ gdkvisual-win32.obj \ gdkwin32id.obj \ |