From: Zeev Suraski <zeev@php.net>
Date: Wed, 14 Jun 2000 16:06:44 +0000 (+0000)
Subject: Thoroughly fix .dsp problems - restore custom builds
X-Git-Tag: php-4.0.1RC~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79f857b323cb1d80d44ee32078d6dc8b1cd02949;p=php

Thoroughly fix .dsp problems - restore custom builds
---

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