- Add bindlib to the Win32 build

5 files changed, 113 insertions, 8 deletions

diff --git a/bindlib_w32/bindlib.dsp b/bindlib_w32/bindlib.dsp
index f683d33bc1..c42f74798e 100644
--- a/bindlib_w32/bindlib.dsp
+++ b/bindlib_w32/bindlib.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=bindlib - Win32 Debug

+CFG=bindlib - Win32 Debug_TS

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,15 @@ CFG=bindlib - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "bindlib.mak" CFG="bindlib - Win32 Debug"

+!MESSAGE NMAKE /f "bindlib.mak" CFG="bindlib - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "bindlib - Win32 Release" (based on "Win32 (x86) Static Library")

 !MESSAGE "bindlib - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "bindlib - Win32 Debug_TS" (based on "Win32 (x86) Static Library")

+!MESSAGE "bindlib - Win32 Release_TS" (based on "Win32 (x86) Static Library")

+!MESSAGE "bindlib - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -74,12 +77,84 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo /out:"Debug\resolv.lib"

 

+!ELSEIF  "$(CFG)" == "bindlib - Win32 Debug_TS"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "bindlib___Win32_Debug_TS"

+# PROP BASE Intermediate_Dir "bindlib___Win32_Debug_TS"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug_TS"

+# PROP Intermediate_Dir "Debug_TS"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WINNT" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WINNT" /FR /YX /FD /GZ /c

+# ADD BASE RSC /l 0x40d /d "_DEBUG"

+# ADD RSC /l 0x40d /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:"Debug\resolv.lib"

+# ADD LIB32 /nologo /out:"Debug_TS\resolv.lib"

+

+!ELSEIF  "$(CFG)" == "bindlib - Win32 Release_TS"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "bindlib___Win32_Release_TS"

+# PROP BASE Intermediate_Dir "bindlib___Win32_Release_TS"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release_TS"

+# PROP Intermediate_Dir "Release_TS"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WINNT" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WINNT" /YX /FD /c

+# ADD BASE RSC /l 0x40d /d "NDEBUG"

+# ADD RSC /l 0x40d /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:"Release\resolv.lib"

+# ADD LIB32 /nologo /out:"Release_TS\resolv.lib"

+

+!ELSEIF  "$(CFG)" == "bindlib - Win32 Release_TS_inline"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "bindlib___Win32_Release_TS_inline"

+# PROP BASE Intermediate_Dir "bindlib___Win32_Release_TS_inline"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release_TS_inline"

+# PROP Intermediate_Dir "Release_TS_inline"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WINNT" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WINNT" /YX /FD /c

+# ADD BASE RSC /l 0x40d /d "NDEBUG"

+# ADD RSC /l 0x40d /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:"Release\resolv.lib"

+# ADD LIB32 /nologo /out:"Release_Ts_inline\resolv.lib"

+

 !ENDIF 

 

 # Begin Target

 

 # Name "bindlib - Win32 Release"

 # Name "bindlib - Win32 Debug"

+# Name "bindlib - Win32 Debug_TS"

+# Name "bindlib - Win32 Release_TS"

+# Name "bindlib - Win32 Release_TS_inline"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

diff --git a/php4.dsw b/php4.dsw
index f96406c5c8..85bc906451 100644
--- a/php4.dsw
+++ b/php4.dsw
@@ -15,6 +15,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "bindlib"=.\bindlib_w32\bindlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "libmysql"=.\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>
 
 Package=<5>
@@ -56,6 +68,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libmysql
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name bindlib
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/php4dll.dsp b/php4dll.dsp
index 705446a1f8..88c30e5bdc 100644
--- a/php4dll.dsp
+++ b/php4dll.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 /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"Zend\Debug" /libpath:"..\bindlib_w32\Debug" /libpath:"ext\mysql\libmysql\Debug_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"Zend\Debug" /libpath:"bindlib_w32\Debug" /libpath:"ext\mysql\libmysql\Debug_TS"

 

 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"

 

@@ -80,7 +80,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 /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS"

 

 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"

 

@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"bindlib_w32\Release_inline"

 

 !ENDIF 

 

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 413acb5be5..957fa984e7 100644
--- a/php4dllts.dsp
+++ b/php4dllts.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 /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"..\bindlib_w32\Debug" /libpath:"ext\mysql\libmysql\Debug_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"bindlib_w32\Debug_TS" /libpath:"ext\mysql\libmysql\Debug_TS"

 

 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

 

@@ -80,7 +80,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 /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"bindlib_w32\Release_TS" /libpath:"ext\mysql\libmysql\Release_TS"

 

 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

 

@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS_inline/php4ts.dll" /libpath:"TSRM\Release_TS_inline" /libpath:"Zend\Release_TS_inline" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS_inline"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS_inline/php4ts.dll" /libpath:"TSRM\Release_TS_inline" /libpath:"Zend\Release_TS_inline" /libpath:"bindlib_w32\Release_TS_inline" /libpath:"ext\mysql\libmysql\Release_TS_inline"

 

 !ENDIF 

 

diff --git a/php4ts.dsw b/php4ts.dsw
index 754823300f..4fbc54386d 100644
--- a/php4ts.dsw
+++ b/php4ts.dsw
@@ -30,6 +30,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "bindlib"=.\bindlib_w32\bindlib.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "libmysql"=.\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>

 

 Package=<5>

@@ -59,6 +71,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libmysql

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name bindlib

+    End Project Dependency

 }}}

 

 ###############################################################################