Thoroughly fix .dsp problems - restore custom builds

diff --git a/php4dll.dsp b/php4dll.dsp
index 0c6226f6e17be6f2868840eaf01b0af0aa630a82..063f4e156b92573f89db44bb286770bc56d4cb11 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -124,11 +124,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=".\configuration-parser.c"\r
+SOURCE=".\main\configuration-parser.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\configuration-scanner.c"\r
+SOURCE=".\main\configuration-scanner.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -231,11 +231,7 @@ SOURCE=.\main\config.w32.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\configuration-parser.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=".\configuration-parser.tab.h"\r
+SOURCE=".\main\configuration-parser.h"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1018,6 +1014,31 @@ SOURCE=.\win32\wfile.h
 # Begin Source File\r
 \r
 SOURCE=".\main\configuration-parser.y"\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
+\r
+# Begin Custom Build\r
+InputPath=".\main\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       cd main \\r
+       if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
+       \r
+\r
+"main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1049,6 +1070,24 @@ InputPath=.\ext\standard\parsedate.y
 # Begin Source File\r
 \r
 SOURCE=".\main\configuration-scanner.l"\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
+\r
+# Begin Custom Build\r
+InputPath=".\main\configuration-scanner.l"\r
+\r
+"main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       cd main \r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l \r
+       \r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Text Files"\r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 4c5739df39818c8202b3530adf276c4ef4f05e8f..81531accb7ddb6feb49b4e38e6ec837091a63e6b 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -124,11 +124,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=".\configuration-parser.c"\r
+SOURCE=".\main\configuration-parser.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\configuration-scanner.c"\r
+SOURCE=".\main\configuration-scanner.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -213,11 +213,7 @@ SOURCE=.\main\config.w32.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\configuration-parser.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=".\configuration-parser.tab.h"\r
+SOURCE=".\main\configuration-parser.h"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -961,6 +957,31 @@ SOURCE=.\win32\wfile.h
 # Begin Source File\r
 \r
 SOURCE=".\main\configuration-parser.y"\r
+\r
+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=".\main\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       cd main \\r
+       if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
+       \r
+\r
+"main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1012,6 +1033,24 @@ InputPath=.\ext\standard\parsedate.y
 # Begin Source File\r
 \r
 SOURCE=".\main\configuration-scanner.l"\r
+\r
+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=".\main\configuration-scanner.l"\r
+\r
+"main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       cd main \r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l \r
+       \r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Text Files"\r