From 3eb0ecf48099a709e757f367f3d5b6f02d8e198f Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 6 May 2001 14:07:49 +0000 Subject: updated exports 2001-01-06 Hans Breuer * gdk/gdk.def : updated exports * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise gdk won't compile anymore * gdk/win32/gdkevents-win32.c : initialize ret_val when processing GDK_FILTER functions, initialize event.key->hardware_keycode. Improved gdk_flush () to not only do pending drawing operations but also process all currently pending events. This should make the behaviour more similar to the X11 version. * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background option needs to be set even if there is no GDK_GC_BACKGROUND. (gdk_win32_hdc_get) : use predraw_set_background () independent of value_mask. This allows to draw dashed lines leaving the original background intact. * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data after processing, because we can't reuse it as the X11 version does. * gtk/gtk.def : updated exports * gtk/makefile.msc.in : added ATK, removed all test apps. (I would like to get rid of this file again, and use straight makefile.msc again, as the other Gtk+ subdirs do) * test/makefile.msc (new file) : build the test apps here (phase two: something has send me a broken pipe signal :) --- tests/makefile.msc | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 tests/makefile.msc (limited to 'tests') diff --git a/tests/makefile.msc b/tests/makefile.msc new file mode 100644 index 0000000000..ed0305d4b7 --- /dev/null +++ b/tests/makefile.msc @@ -0,0 +1,70 @@ +## Makefile for building the gtk test apps with Microsoft C +## Use: nmake -f makefile.msc + +## There is no install target, you have to decide where and +## how to install for yourself. + +TOP = ..\.. +!INCLUDE $(TOP)/build/win32/make.msc + +################################################################ + +# Possibly override versions from build/win32/module.defs +GTK_VER = 1.3 +GDK_PIXBUF_VER = 1.3 +GTK_VER=1.3 + +GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib +GTK_LIBS = ../gtk/gtk-win32-$(GTK_VER).lib +GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib + +INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -I ../gtk +DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) +LDFLAGS = /link /machine:ix86 $(LINKDEBUG) +DEFINES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\" + +TOUCH = copy makefile.msc+nul + +!IFNDEF TESTAPP + +all : \ + ..\config.h \ + prop-editor.obj \ + all-test-apps + +..\config.h : ..\config.h.win32 + copy ..\config.h.win32 ..\config.h + + +# +# Test programs: +# +TESTAPPS = testcalendar testdnd testgtk testinput testrgb testselection \ + testtext testtextbuffer testsocket testsocket_child \ + testtreecolumns testtreefocus testtreesort testtreeview treestoretest \ + testthreads simple + + +all-test-apps: + for %d in ($(TESTAPPS)) do nmake -nologo -f makefile.msc one-test-app THIS=%d + +one-test-app: + @nmake -nologo -f makefile.msc $(THIS).exe TESTAPP=$(THIS) EXTRA_$(THIS)=1 + +!ELSE + +!IFDEF EXTRA_testgtk +EXTRA_OBJETCS = prop-editor.obj +!ENDIF + +!IFDEF EXTRA_testtreeview +EXTRA_OBJETCS = prop-editor.obj +!ENDIF + +$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).dll $(TESTAPP).obj + $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS) + +$(TESTAPP).obj : $(TESTAPP).c + $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c + +!ENDIF \ No newline at end of file -- cgit v1.2.1