From: Tor Lillqvist Date: Mon, 8 Mar 2004 00:41:46 +0000 (+0000) Subject: Update. X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=28675887d027f47c314cea0bc6e7ee11c9730ce8 Update. 2004-03-08 Tor Lillqvist * README.win32: Update. * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. --- diff --git a/ChangeLog b/ChangeLog index 1aa8b257b..52aabeaee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-08 Tor Lillqvist + + * README.win32: Update. + + * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1aa8b257b..52aabeaee 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-03-08 Tor Lillqvist + + * README.win32: Update. + + * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1aa8b257b..52aabeaee 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2004-03-08 Tor Lillqvist + + * README.win32: Update. + + * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1aa8b257b..52aabeaee 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-03-08 Tor Lillqvist + + * README.win32: Update. + + * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1aa8b257b..52aabeaee 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-03-08 Tor Lillqvist + + * README.win32: Update. + + * gtk/gtk.def: Small update. Thanks to J. Ali Harlow. Re-sorted. + Mon Mar 8 01:06:17 2004 Matthias Clasen * tests/testentrycompletion.c: Test dynamic addition/removal. diff --git a/README.win32 b/README.win32 index 9ff6d1379..e2f5b3ab3 100644 --- a/README.win32 +++ b/README.win32 @@ -13,21 +13,35 @@ surprisingly well for the GIMP.) Building GTK+ on Win32 ====================== -There are two ways to build GTK+ for win32: +There are two ways to build GTK+ for win32. 1) Use the autoconf-generated configure script, and the resulting Makefiles (which use libtool and gcc to do the compilation). I use this myself, but it might be hell to setup correctly. Personally I run configure with: -CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32 --enable-maintainer-mode +CC='gcc -mpentium -fnative-struct' CPPFLAGS='-I/target/include' CFLAGS=-O2 LDFLAGS='-L/target/lib' ./configure --disable-static --prefix=/target --with-gdktarget=win32 --with-wintab=/src/wtkit126 --with-ie55=/src/workshop/ie55_lib --host=i386-pc-mingw32 -It might well be that in order for this to work, you will have to get -a bleeding-edge version of libtool for Win32, run libtoolize yourself, -and then run autoconf to generate the configure script. +Then, in theory, you can just say "make", like on Unix. In reality, +there are a few hickups that require manual intervention, and it's +best to run make separately in each subdirectory. At least for me, +when libtool creates an .exe file, it puts the real .exe in the .libs +directory, and leaves a wrapper .exe in the work directory. For some +reason that wrapper doesn't work for me, it doesn't do anything. So, I +always do a "cp .libs/*.exe ." after running a make that has produced +some exes. + +Another issue is with the gdk-pixbuf.loaders file. It's probably best +to do a "make install" in the gdk-pixbuf directory, and let that set +up a mostly correct gdk-pixbuf.loaders in the target directory. Then +copy that back to the source directory. It's needed in gtk/stock-icons +where make runs gdk-pixbuf-csource. + +Etc, you get the idea. It can be a bit of a pain. 2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f -makefile.msc in gdk and gtk. +makefile.msc in gdk and gtk. Be prepared to manually edit various +makefile.msc files, and the makefile snippets in build/win32. Alternative 1 also generates Microsoft import libraries (.lib), if you have lib.exe available. It might also work for cross-compilation from diff --git a/gtk/gtk.def b/gtk/gtk.def index a5275a530..8ad7a4596 100755 --- a/gtk/gtk.def +++ b/gtk/gtk.def @@ -757,7 +757,6 @@ EXPORTS gtk_file_info_free gtk_file_info_get_display_key gtk_file_info_get_display_name -; gtk_file_info_get_icon_type gtk_file_info_get_is_folder gtk_file_info_get_is_hidden gtk_file_info_get_mime_type @@ -765,9 +764,7 @@ EXPORTS gtk_file_info_get_size gtk_file_info_get_type gtk_file_info_new -; gtk_file_info_render_icon gtk_file_info_set_display_name -; gtk_file_info_set_icon_type gtk_file_info_set_is_folder gtk_file_info_set_is_hidden gtk_file_info_set_mime_type @@ -797,6 +794,7 @@ EXPORTS gtk_file_system_list_bookmarks gtk_file_system_list_volumes gtk_file_system_make_path + gtk_file_system_module_get_type gtk_file_system_parse gtk_file_system_path_to_filename gtk_file_system_path_to_uri @@ -1386,8 +1384,8 @@ EXPORTS gtk_paned_pack1 gtk_paned_pack2 gtk_paned_set_position - gtk_path_bar_get_type gtk_parse_args + gtk_path_bar_get_type gtk_path_priority_type_get_type gtk_path_type_get_type gtk_pixmap_get @@ -2430,6 +2428,7 @@ EXPORTS gtk_ui_manager_get_ui gtk_ui_manager_get_widget gtk_ui_manager_insert_action_group + gtk_ui_manager_item_type_get_type gtk_ui_manager_new gtk_ui_manager_new_merge_id gtk_ui_manager_remove_action_group