abies Tue Sep 16 21:25:09 2003 EDT
Modified files:
/php-src/ext/interbase interbase.c interbase.dsp interbase.rc
Log:
Link to fbclient.dll if available
Add client lib name to dll version info
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.183 php-src/ext/interbase/interbase.c:1.184
--- php-src/ext/interbase/interbase.c:1.183 Tue Sep 16 16:28:27 2003
+++ php-src/ext/interbase/interbase.c Tue Sep 16 21:25:08 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.183 2003/09/16 20:28:27 abies Exp $ */
+/* $Id: interbase.c,v 1.184 2003/09/17 01:25:08 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -26,9 +26,9 @@
#include "php.h"
-#define FILE_REVISION "$Revision: 1.183 $"
+#define FILE_REVISION "$Revision: 1.184 $"
-#if HAVE_IBASE && !defined(VERSION_INFO_ONLY)
+#if HAVE_IBASE
#include "php_ini.h"
#include "ext/standard/php_standard.h"
@@ -71,6 +71,8 @@
#define LL_LIT(lit) lit ## I64
#ifdef FB_SQLDA
#pragma comment(lib, "fbclient_ms.lib")
+#else
+#pragma comment(lib, "gds32_ms.lib")
#endif
#else
#define LL_MASK "ll"
Index: php-src/ext/interbase/interbase.dsp
diff -u php-src/ext/interbase/interbase.dsp:1.9
php-src/ext/interbase/interbase.dsp:1.10
--- php-src/ext/interbase/interbase.dsp:1.9 Sun Sep 7 20:41:03 2003
+++ php-src/ext/interbase/interbase.dsp Tue Sep 16 21:25:08 2003
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
ib_util_ms.lib gds32_ms.lib php4ts_debug.lib /nologo /dll /debug /machine:I386
/pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib gds32_ms.lib
php4ts_debug.lib /nologo /dll /debug /machine:I386
/out:"..\..\Debug_TS/php_interbase.dll" /pdbtype:sept
/libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Debug_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib
/nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_interbase.dll"
/pdbtype:sept /libpath:"..\..\..\php_build\Interbase SDK\lib_ms"
/libpath:"..\..\Debug_TS"
!ELSEIF "$(CFG)" == "interbase - Win32 Release_TS"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib ib_util_ms.lib gds32_ms.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
gds32_ms.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_interbase.dll"
/libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /dll /machine:I386 /out:"..\..\Release_TS/php_interbase.dll"
/libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
!ENDIF
@@ -111,9 +111,7 @@
# Begin Source File
SOURCE=.\interbase.rc
-
-# ADD RSC /i "..\..\main" /i "..\..\win32"
-
+# ADD RSC /i "..\..\main" /i "..\..\win32" /d "PHP_H"
# End Source File
# End Group
# End Target
Index: php-src/ext/interbase/interbase.rc
diff -u php-src/ext/interbase/interbase.rc:1.3 php-src/ext/interbase/interbase.rc:1.4
--- php-src/ext/interbase/interbase.rc:1.3 Sun Sep 7 20:32:22 2003
+++ php-src/ext/interbase/interbase.rc Tue Sep 16 21:25:08 2003
@@ -1,76 +1,82 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2003 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | [EMAIL PROTECTED] so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Ard Biesheuvel <[EMAIL PROTECTED]> |
- +----------------------------------------------------------------------+
- */
-
-/* $Id: interbase.rc,v 1.3 2003/09/08 00:32:22 abies Exp $ */
-
-#ifdef APSTUDIO_INVOKED
-#error This file cannot be opened from the Visual Studio IDE
-#endif
-
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-#include "winres.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#include "php_version.h"
-
-#ifdef _DEBUG
-# define BUILD_TYPE "Debug"
-#else
-# define BUILD_TYPE "Release"
-#endif
-
-#define VERSION_INFO_ONLY
-#define PHP_H
-#include "interbase.c"
-
-#ifndef _MAC
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
- PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
-#ifndef _DEBUG
- FILEFLAGS 0x0L
-#else
- FILEFLAGS 0x1L
-#endif
- FILEFLAGSMASK 0x3fL
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "FileDescription", "PHP Interbase module\0"
- VALUE "FileVersion", PHP_VERSION "\0"
- VALUE "File Revision", FILE_REVISION "\0"
- VALUE "LegalCopyright", "Copyright � 2003 The PHP Group\0"
- VALUE "Build Type", BUILD_TYPE "\0"
- VALUE "URL", "http://www.php.net\0";
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
-
-#endif // !_MAC
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 4 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2003 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.0 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_0.txt. |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Ard Biesheuvel <[EMAIL PROTECTED]> |
+ +----------------------------------------------------------------------+
+ */
+
+/* $Id: interbase.rc,v 1.4 2003/09/17 01:25:08 abies Exp $ */
+
+#ifdef APSTUDIO_INVOKED
+#error This file cannot be opened from the Visual Studio IDE
+#endif
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#include "php_version.h"
+
+#ifdef _DEBUG
+# define BUILD_TYPE "Debug"
+#else
+# define BUILD_TYPE "Release"
+#endif
+
+#include <ibase.h>
+#include "interbase.c"
+
+#ifdef FB_SQLDA
+#define CLIENT_LIB "fbclient.dll"
+#else
+#define CLIENT_LIB "gds32.dll"
+#endif
+
+#ifndef _MAC
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+ PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+#ifndef _DEBUG
+ FILEFLAGS 0x0L
+#else
+ FILEFLAGS 0x1L
+#endif
+ FILEFLAGSMASK 0x3fL
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "FileDescription", "PHP Interbase module\0"
+ VALUE "FileVersion", PHP_VERSION "\0"
+ VALUE "File Revision", FILE_REVISION "\0"
+ VALUE "LegalCopyright", "Copyright � 2003 The PHP Group\0"
+ VALUE "Build Type", BUILD_TYPE "\0"
+ VALUE "Client Library", CLIENT_LIB "\0"
+ VALUE "URL", "http://www.php.net\0";
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
+
+#endif // !_MAC
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
