Drop support for php_gd.dll (gd1).

The default build (gd.dsp) is now bundled gd2.

diff --git a/ext/gd/gd.dsp b/ext/gd/gd.dsp
index 5f1def6a4b5e4afcd1a77bace90a7f41fb14249c..1bec282d8f0a43310e267bd050e2c1e7460a242d 100644 (file)
--- a/ext/gd/gd.dsp
+++ b/ext/gd/gd.dsp
@@ -18,9 +18,7 @@ CFG=gd - Win32 Release_TS GD2
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "gd - Win32 Release_TS GD2" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "gd - Win32 Release_TS GD1" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "gd - Win32 Debug_TS GD2" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "gd - Win32 Debug_TS GD1" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -35,8 +33,8 @@ RSC=rc.exe
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gd___Win32_Release_TS_GD2"\r
-# PROP BASE Intermediate_Dir "gd___Win32_Release_TS_GD2"\r
+# PROP BASE Output_Dir "gd___Win32_Release_TS_GD2_bundled"\r
+# PROP BASE Intermediate_Dir "gd___Win32_Release_TS_GD2_bundled"\r
 # PROP BASE Ignore_Export_Lib 0\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
@@ -45,8 +43,9 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D HAVE_LIBGD20=1 /D "USE_GD_IOCTX" /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD204=1 /D HAVE_LIBGD=1 /D "HAVE_GD_GD2" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /YX /FD /c\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D "HAVE_GD_XBM" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "libgd" /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D "HAVE_GD_XBM" /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D "USE_GD_IOCTX" /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D "HAVE_LIBJPEG" /D "HAVE_GD_GD2" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c\r
+# SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
@@ -55,75 +54,17 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 php4ts.lib freetype.lib gd.lib libjpeg.lib libtiff.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
+# ADD BASE LINK32 php4ts.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 php4ts.lib freetype2.lib gd.lib libjpeg.lib libtiff.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ELSEIF  "$(CFG)" == "gd - Win32 Release_TS GD1"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gd___Win32_Release_TS_GD1"\r
-# PROP BASE Intermediate_Dir "gd___Win32_Release_TS_GD1"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release_TS"\r
-# PROP Intermediate_Dir "Release_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D HAVE_LIBTTF=1 /D HAVE_LIBGD15=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D "HAVE_GD_GD2" /FR /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 php4ts.lib freetype.lib gd.lib libjpeg.lib libtiff.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
-# SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 php4ts.lib freetype.lib gd.lib libjpeg.lib libtiff.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
+# ADD LINK32 php4ts.lib freetype2.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gd___Win32_Debug_TS_GD2"\r
-# PROP BASE Intermediate_Dir "gd___Win32_Debug_TS_GD2"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Debug_TS"\r
-# PROP Intermediate_Dir "Debug_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "HAVE_LIBGD15" /D HAVE_LIBGD20=1 /D "USE_GD_IOCTX" /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD204=1 /D HAVE_LIBGD=1 /D "HAVE_GD_GD2" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 php4ts_debug.lib gd.lib libjpeg.lib freetype.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd.dll" /libpath:"..\..\Debug_TS"\r
-# SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 php4ts_debug.lib gd.lib libjpeg.lib freetype2.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd.dll" /libpath:"..\..\Debug_TS"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD1"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gd___Win32_Debug_TS_GD1"\r
-# PROP BASE Intermediate_Dir "gd___Win32_Debug_TS_GD1"\r
+# PROP BASE Output_Dir "gd___Win32_Debug_TS_GD2_bundled"\r
+# PROP BASE Intermediate_Dir "gd___Win32_Debug_TS_GD2_bundled"\r
 # PROP BASE Ignore_Export_Lib 0\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
@@ -132,8 +73,9 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D HAVE_LIBTTF=1 /D HAVE_LIBGD15=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D "HAVE_GD_GD2" /FR /YX /FD /c\r
+# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c\r
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "libgd" /D ZEND_DEBUG=1 /D "HAVE_LIBGD15" /D HAVE_LIBGD204=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D "USE_GD_IOCTX" /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D "HAVE_LIBJPEG" /D "HAVE_GD_GD2" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c\r
+# SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
@@ -142,9 +84,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 php4ts_debug.lib gd.lib libjpeg.lib freetype.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd.dll" /libpath:"..\..\Debug_TS"\r
+# ADD BASE LINK32 php4ts_debug.lib libjpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 php4ts_debug.lib gd.lib libjpeg.lib freetype.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd.dll" /libpath:"..\..\Debug_TS"\r
+# ADD LINK32 php4ts_debug.lib libpng.lib zlib.lib libjpeg.lib freetype2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
@@ -152,9 +94,7 @@ LINK32=link.exe
 # Begin Target\r
 \r
 # Name "gd - Win32 Release_TS GD2"\r
-# Name "gd - Win32 Release_TS GD1"\r
 # Name "gd - Win32 Debug_TS GD2"\r
-# Name "gd - Win32 Debug_TS GD1"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -164,10 +104,6 @@ SOURCE=.\gd.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\gdcache.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\gdttf.c\r
 # End Source File\r
 # End Group\r
@@ -191,5 +127,470 @@ SOURCE=.\php_gd.h
 \r
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 # End Group\r
+# Begin Group "libgd"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 1"\r
+\r
+# PROP Default_Filter "*.c"\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd2copypal.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_arc_f_buggy.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_gd.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_gd2.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_gif_in.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_io.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_io_dp.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_io_file.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_io_ss.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_jpeg.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_png.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_ss.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_topal.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_wbmp.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdcache.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontg.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontl.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontmb.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfonts.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontt.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdft.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdhelpers.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdkanji.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdtables.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdxpm.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\wbmp.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\xbm.c\r
+\r
+!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Release_TS_bundled"\r
+\r
+!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"\r
+\r
+# PROP Intermediate_Dir "Debug_TS_bundled"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 1"\r
+\r
+# PROP Default_Filter "*.h"\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gd_io.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdcache.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontmb.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfonts.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdfontt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\gdhelpers.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\jisx0208.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libgd\wbmp.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
 # End Target\r
 # End Project\r

diff --git a/ext/gd/gd_bundled.dsp b/ext/gd/gd_bundled.dsp
deleted file mode 100644 (file)
index 51c7347..0000000
--- a/ext/gd/gd_bundled.dsp
+++ /dev/null
@@ -1,596 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gd_bundled" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=gd_bundled - Win32 Release_TS GD2\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
-!MESSAGE NMAKE /f "gd_bundled.mak".\r
-!MESSAGE \r
-!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 "gd_bundled.mak" CFG="gd_bundled - Win32 Release_TS GD2"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "gd_bundled - Win32 Release_TS GD2" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "gd_bundled - Win32 Debug_TS GD2" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gd___Win32_Release_TS_GD2_bundled"\r
-# PROP BASE Intermediate_Dir "gd___Win32_Release_TS_GD2_bundled"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release_TS"\r
-# PROP Intermediate_Dir "Release_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D "HAVE_GD_XBM" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "libgd" /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D "HAVE_GD_XBM" /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D "USE_GD_IOCTX" /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D "HAVE_LIBJPEG" /D "HAVE_GD_GD2" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 php4ts.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
-# SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 php4ts.lib freetype2.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gd___Win32_Debug_TS_GD2_bundled"\r
-# PROP BASE Intermediate_Dir "gd___Win32_Debug_TS_GD2_bundled"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Debug_TS"\r
-# PROP Intermediate_Dir "Debug_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "libgd" /D ZEND_DEBUG=1 /D "HAVE_LIBGD15" /D HAVE_LIBGD204=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_WBMP" /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D "USE_GD_IOCTX" /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D "HAVE_LIBJPEG" /D "HAVE_GD_GD2" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 php4ts_debug.lib libjpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"\r
-# SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 php4ts_debug.lib libpng.lib zlib.lib libjpeg.lib freetype2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "gd_bundled - Win32 Release_TS GD2"\r
-# Name "gd_bundled - Win32 Debug_TS GD2"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\gd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gdttf.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\gdcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gdttf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\php_gd.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# Begin Group "libgd"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Group "Source Files No. 1"\r
-\r
-# PROP Default_Filter "*.c"\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd2copypal.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_arc_f_buggy.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_gd.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_gd2.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_gif_in.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_io.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_io_dp.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_io_file.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_io_ss.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_jpeg.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_png.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_ss.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_topal.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_wbmp.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdcache.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontg.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontl.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontmb.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfonts.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontt.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdft.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdhelpers.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdkanji.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdtables.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdxpm.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\wbmp.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\xbm.c\r
-\r
-!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Release_TS_bundled"\r
-\r
-!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
-\r
-# PROP Intermediate_Dir "Debug_TS_bundled"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files No. 1"\r
-\r
-# PROP Default_Filter "*.h"\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gd_io.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontg.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontl.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontmb.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfonts.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdfontt.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\gdhelpers.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\jisx0208.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\libgd\wbmp.h\r
-# End Source File\r
-# End Group\r
-# End Group\r
-# End Target\r
-# End Project\r