From: Duncan C. <dun...@us...> - 2005-02-11 12:52:17
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21710/gtk Modified Files: wingtk.h Log Message: Makefile.am: use -DWIN32 for the gtk modules when building on win32. This is only needed for gtk/Graphics/UI/Gtk.hs but the deps calculation needs it too so we have to specify it for the whole gtk pacakge. #include"gtk/wingtk.h" when compiling Gtk.General.General Add gtk/wingtk.h to EXTRA_DIST. gtk/wingtk.h: #include <gtk/gtk.h> before the #undef directives so that it will not matter which order ghc puts the #includes when compiling via C. gtk/gtk.h has include guards so it can safely be included more than once. configure.ac: remove WIN32 from config.h again. We can pass -DWIN32 to ghc instead. Make the default be to disable the gnome and mozilla packages on win32. Bump version to 0.9.7.1_rc2 Index: wingtk.h =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/wingtk.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- wingtk.h 22 Jan 2003 09:36:49 -0000 1.1 +++ wingtk.h 11 Feb 2005 12:52:06 -0000 1.2 @@ -1,3 +1,4 @@ +#include <gtk/gtk.h> /* these are necessary on Win32 to circumvent the strcuture size check */ #undef gtk_init_check #undef gtk_init |