dbeu Tue Feb 20 09:11:25 2001 EDT
Modified files:
/php4/ext/ldap ldap.dsp
Log:
add configuration which links again libsasl.lib
Index: php4/ext/ldap/ldap.dsp
diff -u php4/ext/ldap/ldap.dsp:1.9 php4/ext/ldap/ldap.dsp:1.10
--- php4/ext/ldap/ldap.dsp:1.9 Thu Aug 24 10:48:23 2000
+++ php4/ext/ldap/ldap.dsp Tue Feb 20 09:11:25 2001
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=ldap - Win32 Debug_TS
+CFG=ldap - Win32 Debug_TS SASL
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,7 +13,7 @@
!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 "ldap.mak" CFG="ldap - Win32 Debug_TS"
+!MESSAGE NMAKE /f "ldap.mak" CFG="ldap - Win32 Debug_TS SASL"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -21,6 +21,8 @@
!MESSAGE "ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "ldap - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "ldap - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ldap - Win32 Release_TS SASL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ldap - Win32 Debug_TS SASL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -108,7 +110,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 oldap32.lib olber32.lib php4nts_debug.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 wsock32.lib /nologo /dll /debug /machine:I386
/pdbtype:sept /libpath:"..\..\..\openldap\libraries\Debug" /libpath:"..\..\Debug"
-# ADD LINK32 oldap32.lib olber32.lib php4ts_debug.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 wsock32.lib /nologo /dll /debug /machine:I386
/out:"Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
/libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD LINK32 oldap32.lib olber32.lib php4ts_debug.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 wsock32.lib /nologo /dll /debug /machine:I386
+/out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+/libpath:"..\..\..\php_build\openldap\libraries\Debug"
!ELSEIF "$(CFG)" == "ldap - Win32 Release_TS"
@@ -136,6 +138,60 @@
# ADD BASE LINK32 oldap32.lib olber32.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 wsock32.lib php4ts.lib /nologo /dll /machine:I386
# ADD LINK32 oldap32.lib olber32.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 wsock32.lib php4ts.lib /nologo /dll /machine:I386
/out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\..\php_build\openldap\libraries\Release"
/libpath:"..\..\Release_TS_Inline"
+!ELSEIF "$(CFG)" == "ldap - Win32 Release_TS SASL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ldap___Win32_Release_TS_SASL"
+# PROP BASE Intermediate_Dir "ldap___Win32_Release_TS_SASL"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS_SASL"
+# PROP Intermediate_Dir "Release_TS_SASL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I
+"..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\openldap\include" /D
+"NDEBUG" /D ZEND_DEBUG=0 /D "ZTS" /D "COMPILE_DL_LDAP" /D "WIN32" /D "_WINDOWS" /D
+"_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1
+/YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I
+"..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\openldap\include" /D
+"NDEBUG" /D ZEND_DEBUG=0 /D "ZTS" /D "COMPILE_DL_LDAP" /D "WIN32" /D "_WINDOWS" /D
+"_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1
+/YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 oldap32.lib olber32.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 wsock32.lib php4ts.lib /nologo /dll /machine:I386
+/out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS"
+/libpath:"..\..\..\php_build\openldap\libraries\Release"
+/libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 oldap32.lib olber32.lib libsasl.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 wsock32.lib php4ts.lib /nologo /dll /machine:I386
+/out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS"
+/libpath:"..\..\..\php_build\openldap\libraries\Release"
+/libpath:"..\..\Release_TS_Inline"
+
+!ELSEIF "$(CFG)" == "ldap - Win32 Debug_TS SASL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ldap___Win32_Debug_TS_SASL"
+# PROP BASE Intermediate_Dir "ldap___Win32_Debug_TS_SASL"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS_SASL"
+# PROP Intermediate_Dir "Debug_TS_SASL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I
+"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I
+"..\..\..\php_build\openldap\include" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D
+"COMPILE_DL_LDAP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS"
+/D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1 /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend"
+/I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\openldap\include" /D
+"_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "COMPILE_DL_LDAP" /D "WIN32" /D "_WINDOWS" /D
+"_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1
+/YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 oldap32.lib olber32.lib php4ts_debug.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 wsock32.lib /nologo /dll /debug /machine:I386
+/out:"Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+/libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD LINK32 oldap32.lib olber32.lib libsasl.lib php4ts_debug.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 wsock32.lib /nologo /dll /debug
+/machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept
+/libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
+
!ENDIF
# Begin Target
@@ -144,6 +200,8 @@
# Name "ldap - Win32 Debug"
# Name "ldap - Win32 Debug_TS"
# Name "ldap - Win32 Release_TS"
+# Name "ldap - Win32 Release_TS SASL"
+# Name "ldap - Win32 Debug_TS SASL"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
