- Add Release_inline builds

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 6f177558b4c2361dbf474450f4de66b03e266bf4..965f2b244d46e79d4e22d5950a97a2eb8945da8a 100644 (file)
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
 \r
-CFG=Zend - Win32 Debug\r
+CFG=Zend - Win32 Release_inline\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,13 @@ CFG=Zend - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Debug"\r
+!MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -71,12 +72,36 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
 \r
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Output_Dir "Zend___Win32_Release_inline"\r
+# PROP BASE Intermediate_Dir "Zend___Win32_Release_inline"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Output_Dir "Zend___Win32_Release_inline"\r
+# PROP Intermediate_Dir "Zend___Win32_Release_inline"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /FR /FD /c\r
+# SUBTRACT BASE CPP /YX\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "WIN32" /D "_MBCS" /D "ZEND_WIN32_FORCE_INLINE" /FR /FD /c\r
+# SUBTRACT CPP /YX\r
+# ADD BASE RSC /l 0x40d /d "NDebug"\r
+# ADD RSC /l 0x40d /d "NDebug"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LIB32=link.exe -lib\r
+# ADD BASE LIB32 /nologo\r
+# ADD LIB32 /nologo\r
+\r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "Zend - Win32 Release"\r
 # Name "Zend - Win32 Debug"\r
+# Name "Zend - Win32 Release_inline"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -230,6 +255,10 @@ SOURCE=.\zend_extensions.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_fast_cache.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_globals.h\r
 # End Source File\r
 # Begin Source File\r
@@ -268,10 +297,6 @@ SOURCE=.\zend_stack.h
 \r
 SOURCE=.\zend_variables.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\zend_fast_cache.h\r
-# End Source File\r
 # End Group\r
 # Begin Group "Parsers"\r
 \r
@@ -309,6 +334,24 @@ BuildCmds= \
        if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
        \r
 \r
+"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
+\r
+# Begin Custom Build\r
+InputDir=.\r
+InputPath=".\zend-parser.y"\r
+\r
+BuildCmds= \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       \r
+\r
 "$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
@@ -347,6 +390,16 @@ InputPath=".\zend-scanner.l"
 \r
 # End Custom Build\r
 \r
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=".\zend-scanner.l"\r
+\r
+"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pzend -ozend-scanner.c zend-scanner.l\r
+\r
+# End Custom Build\r
+\r
 !ENDIF \r
 \r
 # End Source File\r

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index 48d7be8b4b35b22e89c32b5bbd8b1155764a240e..8380c1746cbf86cc21824b8ea1e8235a5b0d4856 100644 (file)
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
 \r
-CFG=ZendTS - Win32 Debug_TS\r
+CFG=ZendTS - Win32 Release_TS_inline\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,13 @@ CFG=ZendTS - Win32 Debug_TS
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Debug_TS"\r
+!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TS_inline"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "ZendTS - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -71,12 +72,36 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
 \r
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TS_inline"\r
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TS_inline"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Output_Dir "ZendTS___Win32_Release_TS_inline"\r
+# PROP Intermediate_Dir "ZendTS___Win32_Release_TS_inline"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c\r
+# SUBTRACT BASE CPP /YX\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c\r
+# SUBTRACT CPP /YX\r
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"\r
+# ADD RSC /l 0x40d /d "NDebug_TS"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LIB32=link.exe -lib\r
+# ADD BASE LIB32 /nologo\r
+# ADD LIB32 /nologo\r
+\r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "ZendTS - Win32 Release_TS"\r
 # Name "ZendTS - Win32 Debug_TS"\r
+# Name "ZendTS - Win32 Release_TS_inline"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -313,6 +338,24 @@ BuildCmds= \
        if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
        \r
 \r
+"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"\r
+\r
+# Begin Custom Build\r
+InputDir=.\r
+InputPath=".\zend-parser.y"\r
+\r
+BuildCmds= \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       \r
+\r
 "$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
@@ -351,6 +394,16 @@ InputPath=".\zend-scanner.l"
 \r
 # End Custom Build\r
 \r
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=".\zend-scanner.l"\r
+\r
+"zend-scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -+ -i -Sflex.skl -Pzend -ozend-scanner.cpp zend-scanner.l\r
+\r
+# End Custom Build\r
+\r
 !ENDIF \r
 \r
 # End Source File\r

diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index d9b1bfc409fa168f310b8237070b10877656727c..4e6f23a555547665140cb14021185c990ae27939 100644 (file)
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -51,7 +51,11 @@ typedef unsigned int uint;
 /* This will cause the compilation process to be MUCH longer, but will generate
  * a much quicker PHP binary
  */
-#define inline __forceinline
+#ifdef ZEND_WIN32_FORCE_INLINE
+# define inline __forceinline
+#else
+# define inline
+#endif
 
 #define DL_LOAD(libname)       LoadLibrary(libname)
 #define DL_FETCH_SYMBOL                GetProcAddress