From cabfc674c2e2f76a51afae8632a1892b540f0ec8 Mon Sep 17 00:00:00 2001
From: Daniel Beulshausen <dbeu@php.net>
Date: Thu, 23 Nov 2000 10:17:37 +0000
Subject: [PATCH] fix libbcmath compile, updated dependencies & add libbcmath
to linker options
---
win32/libbcmath.dsp | 35 +++++++++++++++++++++++++++++------
win32/php4dllts.dsp | 14 +++++---------
win32/php4ts.dsw | 35 +++++++++++++++++++++++++----------
win32/php5ts.dsw | 35 +++++++++++++++++++++++++----------
4 files changed, 84 insertions(+), 35 deletions(-)
diff --git a/win32/libbcmath.dsp b/win32/libbcmath.dsp
index ee3c7c3786..53075484e4 100644
--- a/win32/libbcmath.dsp
+++ b/win32/libbcmath.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=libbcmath - Win32 Debug_TS
+CFG=libbcmath - Win32 Release_TS_Inline
!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,13 @@ CFG=libbcmath - Win32 Debug_TS
!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 "libbcmath.mak" CFG="libbcmath - Win32 Debug_TS"
+!MESSAGE NMAKE /f "libbcmath.mak" CFG="libbcmath - Win32 Release_TS_Inline"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libbcmath - Win32 Release_TS" (based on "Win32 (x86) Static Library")
!MESSAGE "libbcmath - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "libbcmath - Win32 Release_TS_Inline" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -35,11 +36,11 @@ RSC=rc.exe
# PROP BASE Intermediate_Dir "libbcmath_Release_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
-# PROP Output_Dir "libbcmath_Release_TS"
-# PROP Intermediate_Dir "libbcmath_Release_TS"
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug_TS" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../ext/bcmath/libbcmath/src" /I "../Zend" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../ext/bcmath/libbcmath/src" /I "../Zend" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDebug_TS"
# ADD RSC /l 0x409 /d "NDebug_TS"
BSC32=bscmake.exe
@@ -60,7 +61,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "libbcmath_Debug_TS"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_Debug_TS"
# ADD RSC /l 0x409 /d "_Debug_TS"
BSC32=bscmake.exe
@@ -68,6 +69,27 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug_TS\libbcmath.lib"
+
+!ELSEIF "$(CFG)" == "libbcmath - Win32 Release_TS_Inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "libbcmath___Win32_Release_TS_Inline"
+# PROP BASE Intermediate_Dir "libbcmath___Win32_Release_TS_Inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 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 "../ext/bcmath/libbcmath/src" /I "../Zend" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../ext/bcmath/libbcmath/src" /I "../Zend" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDebug_TS"
+# ADD RSC /l 0x409 /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"Release_TS\libbcmath.lib"
# ADD LIB32 /nologo
!ENDIF
@@ -76,6 +98,7 @@ LIB32=link.exe -lib
# Name "libbcmath - Win32 Release_TS"
# Name "libbcmath - Win32 Debug_TS"
+# Name "libbcmath - Win32 Release_TS_Inline"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 3b17f4f61b..4e7a3ed523 100644
--- a/win32/php4dllts.dsp
+++ b/win32/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 /version:4.0 /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 libbcmath.lib /nologo /version:4.0 /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" /libpath:"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 /version:4.0 /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 libcrypt.lib libbcmath.lib /nologo /version:4.0 /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" /libpath:"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 /version:4.0 /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 libbcmath.lib /nologo /version:4.0 /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" /libpath:"Release_TS_Inline"
!ENDIF
@@ -449,10 +449,6 @@ SOURCE=..\ext\session\mod_user.c
# End Source File
# Begin Source File
-SOURCE=..\ext\bcmath\number.c
-# End Source File
-# Begin Source File
-
SOURCE=..\ext\standard\output.c
# End Source File
# Begin Source File
@@ -1130,7 +1126,7 @@ InputPath=..\ext\standard\parsedate.y
"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
cd ..\ext\standard
if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y
- if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y
+ if "X%CYGWIN%"=="X" bison --outpt=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y
# End Custom Build
@@ -1142,7 +1138,7 @@ InputPath=..\ext\standard\parsedate.y
"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
cd ..\ext\standard
if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y
- if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y
+ if "X%CYGWIN%"=="X" bison --outpt=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y
# End Custom Build
diff --git a/win32/php4ts.dsw b/win32/php4ts.dsw
index b9e0c776a8..c811143a33 100644
--- a/win32/php4ts.dsw
+++ b/win32/php4ts.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
-Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>
+Project: "TSRM"="..\TSRM\TSRM.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4>
###############################################################################
-Project: "ZendTS"=..\Zend\ZendTS.dsp - Package Owner=<4>
+Project: "ZendTS"="..\Zend\ZendTS.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -30,7 +30,7 @@ Package=<4>
###############################################################################
-Project: "libmysql"=..\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>
+Project: "libbcmath"=".\libbcmath.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -42,7 +42,19 @@ Package=<4>
###############################################################################
-Project: "php4aolserver"=..\sapi\aolserver\php4aolserver.dsp - Package Owner=<4>
+Project: "libmysql"="..\ext\mysql\libmysql\libmysql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "php4aolserver"="..\sapi\aolserver\php4aolserver.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -57,7 +69,7 @@ Package=<4>
###############################################################################
-Project: "php4apache"=..\sapi\apache\php4apache.dsp - Package Owner=<4>
+Project: "php4apache"="..\sapi\apache\php4apache.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -72,7 +84,7 @@ Package=<4>
###############################################################################
-Project: "php4dllts"=.\php4dllts.dsp - Package Owner=<4>
+Project: "php4dllts"=".\php4dllts.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -92,11 +104,14 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name bindlib
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbcmath
+ End Project Dependency
}}}
###############################################################################
-Project: "php4isapi"=..\sapi\isapi\php4isapi.dsp - Package Owner=<4>
+Project: "php4isapi"="..\sapi\isapi\php4isapi.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -111,7 +126,7 @@ Package=<4>
###############################################################################
-Project: "php4nsapi"=..\sapi\nsapi\php4nsapi.dsp - Package Owner=<4>
+Project: "php4nsapi"="..\sapi\nsapi\php4nsapi.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -126,7 +141,7 @@ Package=<4>
###############################################################################
-Project: "php4ts"=.\php4ts.dsp - Package Owner=<4>
+Project: "php4ts"=".\php4ts.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -144,7 +159,7 @@ Package=<4>
###############################################################################
-Project: "servlet"=..\sapi\servlet\servlet.dsp - Package Owner=<4>
+Project: "servlet"="..\sapi\servlet\servlet.dsp" - Package Owner=<4>
Package=<5>
{{{
diff --git a/win32/php5ts.dsw b/win32/php5ts.dsw
index b9e0c776a8..c811143a33 100644
--- a/win32/php5ts.dsw
+++ b/win32/php5ts.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
-Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>
+Project: "TSRM"="..\TSRM\TSRM.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4>
###############################################################################
-Project: "ZendTS"=..\Zend\ZendTS.dsp - Package Owner=<4>
+Project: "ZendTS"="..\Zend\ZendTS.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -30,7 +30,7 @@ Package=<4>
###############################################################################
-Project: "libmysql"=..\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>
+Project: "libbcmath"=".\libbcmath.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -42,7 +42,19 @@ Package=<4>
###############################################################################
-Project: "php4aolserver"=..\sapi\aolserver\php4aolserver.dsp - Package Owner=<4>
+Project: "libmysql"="..\ext\mysql\libmysql\libmysql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "php4aolserver"="..\sapi\aolserver\php4aolserver.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -57,7 +69,7 @@ Package=<4>
###############################################################################
-Project: "php4apache"=..\sapi\apache\php4apache.dsp - Package Owner=<4>
+Project: "php4apache"="..\sapi\apache\php4apache.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -72,7 +84,7 @@ Package=<4>
###############################################################################
-Project: "php4dllts"=.\php4dllts.dsp - Package Owner=<4>
+Project: "php4dllts"=".\php4dllts.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -92,11 +104,14 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name bindlib
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbcmath
+ End Project Dependency
}}}
###############################################################################
-Project: "php4isapi"=..\sapi\isapi\php4isapi.dsp - Package Owner=<4>
+Project: "php4isapi"="..\sapi\isapi\php4isapi.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -111,7 +126,7 @@ Package=<4>
###############################################################################
-Project: "php4nsapi"=..\sapi\nsapi\php4nsapi.dsp - Package Owner=<4>
+Project: "php4nsapi"="..\sapi\nsapi\php4nsapi.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -126,7 +141,7 @@ Package=<4>
###############################################################################
-Project: "php4ts"=.\php4ts.dsp - Package Owner=<4>
+Project: "php4ts"=".\php4ts.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -144,7 +159,7 @@ Package=<4>
###############################################################################
-Project: "servlet"=..\sapi\servlet\servlet.dsp - Package Owner=<4>
+Project: "servlet"="..\sapi\servlet\servlet.dsp" - Package Owner=<4>
Package=<5>
{{{
--
2.40.0