com gtk/php-gtk: libglade's _almost_ compiling - some export problems still.: ext/libglade/config.w3 2 ext/libglade/libglade.defs
ext/libglade/libglade.ov errides ext/libglade/php_libglade.c ext/libglade/php_ libglade.h

Commit: 133e914ce2d7737dfa12954642aa796e0c20ea7b Author: Steph Fox <sfox@php.net> Thu, 22 Sep 2005 03:29:16 +0000 Parents: 585ef8be2ec46a2f16c7d6ae27734f34abcd0537 Branches: master Link: http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=133e914ce2d7737dfa12954642aa796e0c20ea7b Log: libglade's _almost_ compiling - some export problems still. Changed paths: M ext/libglade/config.w32 M ext/libglade/libglade.defs M ext/libglade/libglade.overrides M ext/libglade/php_libglade.c M ext/libglade/php_libglade.h Diff: 133e914ce2d7737dfa12954642aa796e0c20ea7b diff --git a/ext/libglade/config.w32 b/ext/libglade/config.w32 index 27613c3..ac16895 100644 --- a/ext/libglade/config.w32 +++ b/ext/libglade/config.w32 @@ -5,10 +5,6 @@ if (PHP_GTK_LIBGLADE != "no") { if (CHECK_HEADER("glade\\glade.h") && CHECK_LIB("glade-2.0.lib", "libglade")) { - ADD_FLAG("CFLAGS_LIBGLADE", "/I ext\\libglade /I ..\\ext\\libglade /D HAVE_LIBGLADE=1"); - EXTENSION("libglade", "php_libglade.c gen_libglade.c", true); // always shared - AC_DEFINE("HAVE_LIBGLADE", 1, "libglade enabled"); - if (FSO.FileExists("win32\\temp.bat")) { var temp = FSO.OpenTextFile("win32\\temp.bat", 8); @@ -18,6 +14,10 @@ if (PHP_GTK_LIBGLADE != "no") { temp.WriteLine('grep -h "^PHP_GTK_EXPORT_CE" ext\\libglade\\gen_libglade.c | sed -e "s/^/PHP_GTK_API extern /" > ext\\libglade\\gen_libglade.h'); } + ADD_FLAG("CFLAGS_LIBGLADE", "/I ext\\libglade /I ..\\ext\\libglade /D HAVE_LIBGLADE=1"); + EXTENSION("libglade", "php_libglade.c gen_libglade.c", true); // always shared + AC_DEFINE("HAVE_LIBGLADE", 1, "libglade enabled"); + } else { WARNING("libglade not enabled; libraries and headers not found"); diff --git a/ext/libglade/libglade.defs b/ext/libglade/libglade.defs index 673dc4c..84b4839 100644 --- a/ext/libglade/libglade.defs +++ b/ext/libglade/libglade.defs @@ -3,7 +3,7 @@ (define-object XML (in-module "Glade") - (parent "GtkObject") + (parent "GObject") (c-name "GladeXML") (gtype-id "GLADE_TYPE_XML") ) diff --git a/ext/libglade/libglade.overrides b/ext/libglade/libglade.overrides index 43349f0..96803d5 100644 --- a/ext/libglade/libglade.overrides +++ b/ext/libglade/libglade.overrides @@ -3,6 +3,7 @@ headers #include <glade/glade.h> #include "ext/gtk+/php_gtk+.h" +#include "ext/gtk+/gen_gtk.h" %% ignore-glob *_get_type diff --git a/ext/libglade/php_libglade.c b/ext/libglade/php_libglade.c index f725768..6a12198 100644 --- a/ext/libglade/php_libglade.c +++ b/ext/libglade/php_libglade.c @@ -30,6 +30,7 @@ PHP_GTK_GET_EXTENSION(libglade); PHP_GTK_XINIT_FUNCTION(libglade) { + //php_libglade_register_constants(module_number TSRMLS_CC); phpg_libglade_register_classes(); phpg_libglade_register_constants("GLADE_"); diff --git a/ext/libglade/php_libglade.h b/ext/libglade/php_libglade.h index 418235f..e3cd87a 100644 --- a/ext/libglade/php_libglade.h +++ b/ext/libglade/php_libglade.h @@ -33,13 +33,14 @@ extern php_gtk_ext_entry libglade_ext_entry; #define php_gtk_ext_libglade_ptr &libglade_ext_entry -void phpg_libglade_register_constants(const char *strip_prefix); +//void php_libglade_register_constants(int module_number TSRMLS_DC); void phpg_libglade_register_classes(void); +void phpg_libglade_register_constants(const char *strip_prefix); #else #define php_gtk_ext_libglade_ptr NULL -#endif /* HAVE_LIBGLADE */ +#endif /* HAVE_LIBGLADE */ -#endif /* PHP_LIBGLADE_H */ +#endif /* PHP_LIBGLADE_H */