com gtk/php-gtk: Missing flag. Amongst other things.: win32/confutils.js

[email protected] (David Soria Parra) Fri, 23 Sep 2005 10:08:03 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    0231d0b5a046b8728110367fc0001a16193a82ff=0AAuthor:    Steph Fox =
<[email protected]>         Fri, 23 Sep 2005 10:08:03 +0000=0AParents:   5b2f53c=
4929e7c3f3972f0ac757233fb7cb806e7=0ABranches:  master=0A=0ALink:       http=
://git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3D0231d0b5a046b8728110=
367fc0001a16193a82ff=0A=0ALog:=0AMissing flag.  Amongst other things.=0A=0A=
Changed paths:=0A  M  win32/confutils.js=0A=0A=0ADiff:=0A0231d0b5a046b87281=
10367fc0001a16193a82ff=0Adiff --git a/win32/confutils.js b/win32/confutils.=
js=0Aindex b9ce321..1df3382 100644=0A--- a/win32/confutils.js=0A+++ b/win32=
/confutils.js=0A@@ -17,7 +17,7 @@=0A   +-----------------------------------=
-----------------------------------+=0A */=0A =0A-// $Id: confutils.js,v 1.=
10 2005-09-22 03:30:33 sfox Exp $=0A+// $Id: confutils.js,v 1.11 2005-09-23=
 10:08:03 sfox Exp $=0A =0A /* set vars */=0A var STDOUT =3D WScript.StdOut=
;=0A@@ -620,6 +620,7 @@ function EXTENSION(extname, file_list, shared, cfla=
gs, dllname, obj_dir) {=0A =09var dep_libs =3D "";=0A =09var EXT =3D extnam=
e.toUpperCase().replace(new RegExp("-", "g"), "_");=0A =09var extname_for_p=
rinting;=0A+=09var res_var =3D "";=0A =0A =09if (cflags =3D=3D null) {=0A =
=09=09cflags =3D "";=0A@@ -652,8 +653,10 @@ function EXTENSION(extname, fil=
e_list, shared, cflags, dllname, obj_dir) {=0A =09=09if (extname =3D=3D 'ph=
p-gtk') {=0A =09=09=09dllname =3D extname + "2.dll";=0A =09=09=09resname =
=3D generate_version_info_resource(dllname, configure_module_dirname);=0A+=
=09=09=09res_var =3D " $(PHPGTKDLL_RES)";=0A =09=09} else {=0A-=09=09=09dll=
name =3D "php_gtk_" + extname + ".dll";=0A+=09=09=09cflags =3D "/D GTK_SHAR=
ED=3D1 " + cflags;=0A+=09=09=09dllname =3D "php_gtk_" + extname + "2.dll";=
=0A =09=09=09dllflags =3D " $(DLL_LDFLAGS)";=0A =09=09=09dep_libs =3D " $(B=
UILD_DIR)\\$(PHPGTKLIB) $(LIBS_PHP_GTK)";=0A =09=09}=0A@@ -663,8 +666,8 @@ =
function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) {=
=0A =0A =09ADD_FLAG("EXT_TARGETS", "$(BUILD_DIR)\\"+dllname);=0A =0A-=09MFO=
.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(" + EXT + "_GLOBAL_OBJS) $(PHP=
GTKDLL_RES)");=0A-=09MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dll=
name + " $(" + EXT + "_LDFLAGS)" + dllflags + " $(LDFLAGS) $(" + EXT + "_GL=
OBAL_OBJS) $(LIBS_" + EXT + ")" + dep_libs + " $(LIBS) $(PHPGTKDLL_RES)");=
=0A+=09MFO.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(" + EXT + "_GLOBAL_O=
BJS)" + res_var);=0A+=09MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + =
dllname + " $(" + EXT + "_LDFLAGS)" + dllflags + " $(LDFLAGS) $(" + EXT + "=
_GLOBAL_OBJS) $(LIBS_" + EXT + ")" + dep_libs + " $(LIBS)" + res_var);=0A =
=0A =09MFO.WriteBlankLines(1);=0A =09MFO.WriteLine(dllname + ": $(BUILD_DIR=
)\\" + dllname);=0A