Link to fbclient.dll if available

Add client lib name to dll version info

3 files changed, 14 insertions, 8 deletions

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index dfb71ab72e..43c60f64d9 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -28,7 +28,7 @@
 
 #define FILE_REVISION "$Revision$"
 
-#if HAVE_IBASE && !defined(VERSION_INFO_ONLY)
+#if HAVE_IBASE
 
 #include "php_ini.h"
 #include "ext/standard/php_standard.h"
@@ -71,6 +71,8 @@ typedef unsigned long long ISC_UINT64;
 #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"
diff --git a/ext/interbase/interbase.dsp b/ext/interbase/interbase.dsp
index feea844502..b38872c199 100644
--- a/ext/interbase/interbase.dsp
+++ b/ext/interbase/interbase.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # 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 @@ BSC32=bscmake.exe
 # 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 @@ SOURCE=.\php_interbase.h
 # 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

diff --git a/ext/interbase/interbase.rc b/ext/interbase/interbase.rc
index 03f18388e4..85bd149f8c 100644
--- a/ext/interbase/interbase.rc
+++ b/ext/interbase/interbase.rc
@@ -36,10 +36,15 @@
 # define BUILD_TYPE "Release"
 #endif
 
-#define VERSION_INFO_ONLY
-#define PHP_H
+#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
@@ -64,6 +69,7 @@ BEGIN
             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