Revert config.w32.h.in -> config.w32.h build step per discussion with Zeev.

diff --git a/main/config.w32.h.in b/main/config.w32.h
similarity index 100%
rename from main/config.w32.h.in
rename to main/config.w32.h

diff --git a/win32/php4dll.dsp b/win32/php4dll.dsp
index f0a3591b0adedaaf76adea5279752f6374bc9f09..2cc4b8335b02d2aa597ef7e203ebfed2b3314b3f 100644 (file)
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -249,26 +249,7 @@ SOURCE=..\ext\standard\aggregation.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\config.w32.h.in\r
-\r
-!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
-\r
-# Begin Custom Build - Generating main/config.w32.h\r
-InputPath=..\main\config.w32.h.in\r
-\r
-"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h ( \r
-       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul \r
-       ) \r
-       \r
-# End Custom Build\r
-\r
-!ENDIF \r
-\r
+SOURCE=..\ext\standard\config.w32.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 6cc54dc139497eea472a48f34da3aa229507a49d..b496c5d0e1528e1fd9a352995324a570e87754d1 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -278,58 +278,7 @@ SOURCE=..\ext\standard\aggregation.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\config.w32.h.in\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
-# Begin Custom Build - Generating main/config.w32.h\r
-InputPath=..\main\config.w32.h.in\r
-\r
-"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h ( \r
-       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul \r
-       ) \r
-       \r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
-# Begin Custom Build - Generating main/config.w32.h\r
-InputPath=..\main\config.w32.h.in\r
-\r
-"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h ( \r
-       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul \r
-       ) \r
-       \r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
-\r
-# Begin Custom Build - Generating main/config.w32.h\r
-InputPath=..\main\config.w32.h.in\r
-\r
-"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h ( \r
-       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul \r
-       ) \r
-       \r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
-\r
-# Begin Custom Build - Generating main/config.w32.h\r
-InputPath=..\main\config.w32.h.in\r
-\r
-"..\main\config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h ( \r
-       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul \r
-       ) \r
-       \r
-# End Custom Build\r
-\r
-!ENDIF \r
-\r
+SOURCE=..\ext\standard\config.w32.h\r
 # End Source File\r
 # Begin Source File\r
 \r