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
| From: | David Soria Parra | Date: | Wed, 21 Sep 2005 09:39:41 +0000 |
| Subject: | 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 | ||
| Groups: | php.gtk.cvs | ||
| Request: | Send a blank email to php-gtk-cvs+get-4827@lists.php.net to get a copy of this message | ||
Commit: c47fd3edf66edcc1de8af549957090f472e081bd
Author: Steph Fox <sfox@php.net> Wed, 21 Sep 2005 09:39:41 +0000
Parents: 7970bf3ef64326bcd915aa9897a93c0d594d63bc
Branches: master
Link: http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=c47fd3edf66edcc1de8af549957090f472e081bd
Log:
Initial extension support.
Half this patch came from Tom Rogers. We're having a race :)
Changed paths:
M win32/config.w32.in
M win32/confutils.js
Diff:
c47fd3edf66edcc1de8af549957090f472e081bd
diff --git a/win32/config.w32.in b/win32/config.w32.in
index 0603e5b..5a979be 100644
--- a/win32/config.w32.in
+++ b/win32/config.w32.in
@@ -79,10 +79,10 @@ DEFINE("PHP_GTK_LDFLAGS", "$(DLL_LDFLAGS)");
DEFINE("LIBS", "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib");
if (PHP_GTK_DEBUG == "yes") {
- DEFINE("CFLAGS", "/nologo /LDd /MDd /Gm /ZI /GZ /I ..\\php5\\main /I ..\\php5\\Zend
/I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=1 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS
/D _MBCS /D _USRDLL");
+ DEFINE("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=1 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
ADD_FLAG("LDFLAGS", "/debug");
} else {
- DEFINE("CFLAGS", "/nologo /MT /W3 /GX /O2 /I ..\\php5\\main /I ..\\php5\\Zend /I
..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=1 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D NDEBUG /D _WINDOWS /D
_MBCS /D _USRDLL");
+ DEFINE("CFLAGS", "/nologo /MT /W3 /GX /O2 /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=1 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
}
if (VCVERS < 14) {
@@ -96,9 +96,6 @@ if (VCVERS >= 14) {
ADD_FLAG('CFLAGS', '/GS /wd4996 ');
}
-// Base includes
-ADD_FLAG("CFLAGS_PHP_GTK", "/I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I
..\\ext");
-
if (PHP_GTK_PHP_BUILD == 'no') {
if (FSO.FolderExists("..\\php_build")) {
PHP_GTK_PHP_BUILD = "..\\php_build";
@@ -115,3 +112,4 @@ var php_usual_lib_suspects = "..\\php_build\\lib;..\\win32build\\lib";
probe_basic_headers();
ADD_SOURCES("main", "php_gtk.c php_gtk_ext.w32.c php_gtk_util.c phpg_closure.c
phpg_exceptions.c phpg_gboxed.c phpg_gobject.c phpg_gtype.c phpg_gvalue.c phpg_support.c",
"php-gtk");
+
diff --git a/win32/confutils.js b/win32/confutils..js
index fd5bfac..b25d192 100644
--- a/win32/confutils.js
+++ b/win32/confutils.js
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1..8 2005-09-20 02:17:53 sfox Exp $
+// $Id: confutils.js,v 1.9 2005-09-21 09:39:41 sfox Exp $
/* set vars */
var STDOUT = WScript.StdOut;
@@ -650,10 +650,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) {
var EXT = extname.toUpperCase().replace(new RegExp("-", "g"), "_");
var extname_for_printing;
- if (shared == null) {
- eval("shared = PHP_GTK_" + EXT + "_SHARED;");
- }
-
if (cflags == null) {
cflags = "";
}
@@ -683,6 +679,7 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) {
if (dllname == null) {
if (extname == 'php-gtk') {
dllname = extname + "2.dll";
+ resname = generate_version_info_resource(dllname, configure_module_dirname);
} else {
dllname = "php_gtk_" + extname + ".dll";
}
@@ -690,10 +687,10 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) {
var libname = dllname.substring(0, dllname.length-4) + ".lib";
var ld = "@$(LD)";
- resname = generate_version_info_resource(dllname, configure_module_dirname);
+ ADD_FLAG("EXT_TARGETS", "$(BUILD_DIR)\\"+dllname);
- MFO.WriteLine("$(BUILD_DIR)\\$(PHPGTKDLL): $(" + EXT + "_GLOBAL_OBJS)
$(PHPGTKDLL_RES)");
- MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\$(PHPGTKDLL) $(" + EXT +
"_LDFLAGS) $(LDFLAGS) $(" + EXT + "_GLOBAL_OBJS) $(LIBS_" + EXT + ")
$(LIBS) $(PHPGTKDLL_RES)");
+ MFO.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(" + EXT + "_GLOBAL_OBJS)
$(PHPGTKDLL_RES)");
+ MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + " $(" +
EXT + "_LDFLAGS) $(LDFLAGS) $(" + EXT + "_GLOBAL_OBJS) $(LIBS_" + EXT + ")
$(LIBS) $(PHPGTKDLL_RES)");
MFO.WriteBlankLines(1);
MFO.WriteLine(dllname + ": $(BUILD_DIR)\\" + dllname);
@@ -990,7 +987,7 @@ function generate_makefile() {
}
MF.WriteBlankLines(1);
- MF.WriteLine("all: $(BUILD_DIR)\\$(PHPGTKDLL)");
+ MF.WriteLine("all: $(EXT_TARGETS)");
MF.WriteLine("build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB)");
MF.WriteBlankLines(1);