edink Wed Nov 13 16:38:58 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/win32 php4dll.dsp php4dllts.dsp
Log:
MFH (relly disable compilation of mbstring)
Index: php4/win32/php4dll.dsp
diff -u php4/win32/php4dll.dsp:1.37 php4/win32/php4dll.dsp:1.37.2.1
--- php4/win32/php4dll.dsp:1.37 Thu Sep 26 02:10:22 2002
+++ php4/win32/php4dll.dsp Wed Nov 13 16:38:57 2002
@@ -205,27 +205,27 @@
# End Source File
# Begin Source File
-SOURCE=..\main\streams.c
+SOURCE=..\main\snprintf.c
# End Source File
# Begin Source File
-SOURCE=..\main\user_streams.c
+SOURCE=..\main\spprintf.c
# End Source File
# Begin Source File
-SOURCE=..\main\strlcat.c
+SOURCE=..\main\streams.c
# End Source File
# Begin Source File
-SOURCE=..\main\strlcpy.c
+SOURCE=..\main\strlcat.c
# End Source File
# Begin Source File
-SOURCE=..\main\snprintf.c
+SOURCE=..\main\strlcpy.c
# End Source File
# Begin Source File
-SOURCE=..\main\spprintf.c
+SOURCE=..\main\user_streams.c
# End Source File
# End Group
# Begin Group "Header Files"
@@ -239,40 +239,20 @@
SOURCE=..\main\config.w32.h.in
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
-
-# Begin Custom Build - Generating main/config.w32.h
-InputPath=..\main\config.w32.h.in
-
-"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- if not exist ..\main\config.w32.h (
- copy ..\main\config.w32.h.in ..\main\config.w32.h > nul
- )
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
-
-# Begin Custom Build - Generating main/config.w32.h
-InputPath=..\main\config.w32.h.in
-
-"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- if not exist ..\main\config.w32.h (
- copy ..\main\config.w32.h.in ..\main\config.w32.h > nul
- )
+!IF "$(CFG)" == "php4dll - Win32 Debug"
-# End Custom Build
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
# Begin Custom Build - Generating main/config.w32.h
InputPath=..\main\config.w32.h.in
"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- if not exist ..\main\config.w32.h (
- copy ..\main\config.w32.h.in ..\main\config.w32.h > nul
- )
-
+ if not exist ..\main\config.w32.h (
+ copy ..\main\config.w32.h.in ..\main\config.w32.h > nul
+ )
+
# End Custom Build
!ENDIF
@@ -348,27 +328,27 @@
# End Source File
# Begin Source File
-SOURCE=..\main\snprintf.h
+SOURCE=..\ext\standard\quot_print.h
# End Source File
# Begin Source File
-SOURCE=..\main\spprintf.h
+SOURCE=..\main\rfc1867.h
# End Source File
# Begin Source File
-SOURCE=..\ext\standard\quot_print.h
+SOURCE=..\main\safe_mode.h
# End Source File
# Begin Source File
-SOURCE=..\main\rfc1867.h
+SOURCE=..\main\SAPI.h
# End Source File
# Begin Source File
-SOURCE=..\main\safe_mode.h
+SOURCE=..\main\snprintf.h
# End Source File
# Begin Source File
-SOURCE=..\main\SAPI.h
+SOURCE=..\main\spprintf.h
# End Source File
# Begin Source File
@@ -908,50 +888,6 @@
# Begin Source File
SOURCE=..\ext\ctype\ctype.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_cn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_ja.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_kr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_ru.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_tw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbregex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbstring.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\php_mbregex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\php_unicode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\html_entities.c
# End Source File
# Begin Source File
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.87 php4/win32/php4dllts.dsp:1.87.2.1
--- php4/win32/php4dllts.dsp:1.87 Tue Oct 15 12:56:00 2002
+++ php4/win32/php4dllts.dsp Wed Nov 13 16:38:57 2002
@@ -450,22 +450,22 @@
# Begin Source File
SOURCE=..\ext\pcre\pcrelib\get.c
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2
# End Source File
# Begin Source File
SOURCE=..\ext\pcre\pcrelib\maketables.c
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2
# End Source File
# Begin Source File
SOURCE=..\ext\pcre\pcrelib\pcre.c
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2
# End Source File
# Begin Source File
SOURCE=..\ext\pcre\pcrelib\study.c
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2
# End Source File
# End Group
# Begin Group "Header Files No. 3"
@@ -513,51 +513,7 @@
# End Source File
# Begin Source File
-SOURCE=..\ext\mbstring\html_entities.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_cn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_ja.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_kr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_ru.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbfilter_tw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbregex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\mbstring.c
-# End Source File
-# Begin Source File
-
SOURCE=..\ext\overload\overload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\php_mbregex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\mbstring\php_unicode.c
# End Source File
# Begin Source File
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
