com gtk/php-gtk: Initial extension support. Half this patch came from Tom Rogers. We're having a race :): win32/config.w32.in win32/confutils.js

Commit:    c47fd3edf66edcc1de8af549957090f472e081bd=0AAuthor:    Steph Fox =
<[email protected]>         Wed, 21 Sep 2005 09:39:41 +0000=0AParents:   7970bf3=
ef64326bcd915aa9897a93c0d594d63bc=0ABranches:  master=0A=0ALink:       http=
://git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3Dc47fd3edf66edcc1de8a=
f549957090f472e081bd=0A=0ALog:=0AInitial extension support.=0AHalf this pat=
ch came from Tom Rogers.  We're having a race :)=0A=0AChanged paths:=0A  M =
 win32/config.w32.in=0A  M  win32/confutils.js=0A=0A=0ADiff:=0Ac47fd3edf66e=
dcc1de8af549957090f472e081bd=0Adiff --git a/win32/config.w32.in b/win32/con=
fig.w32.in=0Aindex 0603e5b..5a979be 100644=0A--- a/win32/config.w32.in=0A++=
+ b/win32/config.w32.in=0A@@ -79,10 +79,10 @@ DEFINE("PHP_GTK_LDFLAGS", "$(=
DLL_LDFLAGS)");=0A DEFINE("LIBS", "kernel32.lib user32.lib gdi32.lib winspo=
ol.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib");=0A =0A if (PHP_GT=
K_DEBUG =3D=3D "yes") {=0A-=09DEFINE("CFLAGS", "/nologo /LDd /MDd /Gm /ZI /=
GZ /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D Z=
TS=3D1 /D ZEND_DEBUG=3D0 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MB=
CS /D _USRDLL");=0A+=09DEFINE("CFLAGS", "/nologo /LDd /MDd /Gm /ZI /GZ /I .=
 /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main =
/I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=3D1 /D ZEND_DEBUG=
=3D0 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL");=0A =
=09ADD_FLAG("LDFLAGS", "/debug");=0A } else {=0A-=09DEFINE("CFLAGS", "/nolo=
go /MT /W3 /GX /O2 /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D=
 ZEND_WIN32 /D ZTS=3D1 /D ZEND_DEBUG=3D0 /D PHP_WIN32 /D WIN32 /D NDEBUG /D=
 _WINDOWS /D _MBCS /D _USRDLL");=0A+=09DEFINE("CFLAGS", "/nologo /MT /W3 /G=
X /O2 /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\p=
hp5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=3D1 /D Z=
END_DEBUG=3D0 /D PHP_WIN32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRD=
LL");=0A }=0A =0A if (VCVERS < 14) {=0A@@ -96,9 +96,6 @@ if (VCVERS >=3D 14=
) {=0A =09ADD_FLAG('CFLAGS', '/GS /wd4996 ');=0A }=0A =0A-// Base includes=
=0A-ADD_FLAG("CFLAGS_PHP_GTK", "/I . /I ..\\ /I ..\\.. /I main /I ..\\main =
/I ext /I ..\\ext");=0A-=0A if (PHP_GTK_PHP_BUILD =3D=3D 'no') {=0A =09if (=
FSO.FolderExists("..\\php_build")) {=0A =09=09PHP_GTK_PHP_BUILD =3D "..\\ph=
p_build";=0A@@ -115,3 +112,4 @@ var php_usual_lib_suspects =3D "..\\php_bui=
ld\\lib;..\\win32build\\lib";=0A probe_basic_headers();=0A =0A ADD_SOURCES(=
"main", "php_gtk.c php_gtk_ext.w32.c php_gtk_util.c phpg_closure.c phpg_exc=
eptions.c phpg_gboxed.c phpg_gobject.c phpg_gtype.c phpg_gvalue.c phpg_supp=
ort.c", "php-gtk");=0A+=0Adiff --git a/win32/confutils.js b/win32/confutils=
.js=0Aindex fd5bfac..b25d192 100644=0A--- a/win32/confutils.js=0A+++ b/win3=
2/confutils.js=0A@@ -17,7 +17,7 @@=0A   +----------------------------------=
------------------------------------+=0A */=0A =0A-// $Id: confutils.js,v 1=
.8 2005-09-20 02:17:53 sfox Exp $=0A+// $Id: confutils.js,v 1.9 2005-09-21 =
09:39:41 sfox Exp $=0A =0A /* set vars */=0A var STDOUT =3D WScript.StdOut;=
=0A@@ -650,10 +650,6 @@ function EXTENSION(extname, file_list, shared, cfla=
gs, dllname, obj_dir) {=0A =09var EXT =3D extname.toUpperCase().replace(new=
 RegExp("-", "g"), "_");=0A =09var extname_for_printing;=0A =0A-=09if (shar=
ed =3D=3D null) {=0A-=09=09eval("shared =3D PHP_GTK_" + EXT + "_SHARED;");=
=0A-=09}=0A-=0A =09if (cflags =3D=3D null) {=0A =09=09cflags =3D "";=0A =09=
}=0A@@ -683,6 +679,7 @@ function EXTENSION(extname, file_list, shared, cfla=
gs, dllname, obj_dir) {=0A =09if (dllname =3D=3D null) {=0A =09=09if (extna=
me =3D=3D 'php-gtk') {=0A =09=09=09dllname =3D extname + "2.dll";=0A+=09=09=
=09resname =3D generate_version_info_resource(dllname, configure_module_dir=
name);=0A =09=09} else {=0A =09=09=09dllname =3D "php_gtk_" + extname + ".d=
ll";=0A =09=09}=0A@@ -690,10 +687,10 @@ function EXTENSION(extname, file_li=
st, shared, cflags, dllname, obj_dir) {=0A =09var libname =3D dllname.subst=
ring(0, dllname.length-4) + ".lib";=0A =09var ld =3D "@$(LD)";=0A =0A-=09re=
sname =3D generate_version_info_resource(dllname, configure_module_dirname)=
;=0A+=09ADD_FLAG("EXT_TARGETS", "$(BUILD_DIR)\\"+dllname);=0A =0A-=09MFO.Wr=
iteLine("$(BUILD_DIR)\\$(PHPGTKDLL): $(" + EXT + "_GLOBAL_OBJS) $(PHPGTKDLL=
_RES)");=0A-=09MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\$(PHPGTKDLL) =
$(" + EXT + "_LDFLAGS) $(LDFLAGS) $(" + EXT + "_GLOBAL_OBJS) $(LIBS_" + EXT=
 + ") $(LIBS) $(PHPGTKDLL_RES)");=0A+=09MFO.WriteLine("$(BUILD_DIR)\\" + dl=
lname + ": $(" + EXT + "_GLOBAL_OBJS) $(PHPGTKDLL_RES)");=0A+=09MFO.WriteLi=
ne("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + " $(" + EXT + "_LDFLAGS) =
$(LDFLAGS) $(" + EXT + "_GLOBAL_OBJS) $(LIBS_" + EXT + ") $(LIBS) $(PHPGTKD=
LL_RES)");=0A =09MFO.WriteBlankLines(1);=0A =0A =09MFO.WriteLine(dllname + =
": $(BUILD_DIR)\\" + dllname);=0A@@ -990,7 +987,7 @@ function generate_make=
file() {=0A =09}=0A =0A =09MF.WriteBlankLines(1);=0A-=09MF.WriteLine("all: =
$(BUILD_DIR)\\$(PHPGTKDLL)");=0A+=09MF.WriteLine("all: $(EXT_TARGETS)");=0A=
 =09MF.WriteLine("build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB)");=0A =09MF.Wr=
iteBlankLines(1);=0A