Add gd_bundled to php_modules.dsw.

diff --git a/ext/gd/gd_bundled.dsp b/ext/gd/gd_bundled.dsp
index d5b2ac7e938bc8d2ef3e9d7d0bd6a59a9c183082..0e0cd32a9d9dd66b6b5cfbbefaa8326002424872 100644 (file)
--- a/ext/gd/gd_bundled.dsp
+++ b/ext/gd/gd_bundled.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
-CFG=gd - Win32 Release_TS GD2 bundled\r
+CFG=gd_bundled - Win32 Release_TS GD2 bundled\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,12 @@ CFG=gd - Win32 Release_TS GD2 bundled
 !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 - Win32 Release_TS GD2 bundled"\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 - Win32 Release_TS GD2 bundled" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "gd - Win32 Debug_TS GD2 bundled" (based on "Win32 (x86) Dynamic-Link Library")\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
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -58,7 +58,7 @@ LINK32=link.exe
 # 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 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -91,8 +91,8 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "gd - Win32 Release_TS GD2 bundled"\r
-# Name "gd - Win32 Debug_TS GD2 bundled"\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
@@ -143,11 +143,11 @@ SOURCE=.\php_gd.h
 \r
 SOURCE=.\libgd\gd.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -158,11 +158,11 @@ SOURCE=.\libgd\gd.c
 \r
 SOURCE=.\libgd\gd2copypal.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -173,11 +173,11 @@ SOURCE=.\libgd\gd2copypal.c
 \r
 SOURCE=.\libgd\gd_arc_f_buggy.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -188,11 +188,11 @@ SOURCE=.\libgd\gd_arc_f_buggy.c
 \r
 SOURCE=.\libgd\gd_gd.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -203,11 +203,11 @@ SOURCE=.\libgd\gd_gd.c
 \r
 SOURCE=.\libgd\gd_gd2.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -218,11 +218,11 @@ SOURCE=.\libgd\gd_gd2.c
 \r
 SOURCE=.\libgd\gd_io.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -233,11 +233,11 @@ SOURCE=.\libgd\gd_io.c
 \r
 SOURCE=.\libgd\gd_io_dp.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -248,11 +248,11 @@ SOURCE=.\libgd\gd_io_dp.c
 \r
 SOURCE=.\libgd\gd_io_file.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -263,11 +263,11 @@ SOURCE=.\libgd\gd_io_file.c
 \r
 SOURCE=.\libgd\gd_io_ss.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -278,11 +278,11 @@ SOURCE=.\libgd\gd_io_ss.c
 \r
 SOURCE=.\libgd\gd_jpeg.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -293,11 +293,11 @@ SOURCE=.\libgd\gd_jpeg.c
 \r
 SOURCE=.\libgd\gd_png.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -308,11 +308,11 @@ SOURCE=.\libgd\gd_png.c
 \r
 SOURCE=.\libgd\gd_ss.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -323,11 +323,11 @@ SOURCE=.\libgd\gd_ss.c
 \r
 SOURCE=.\libgd\gd_topal.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -338,11 +338,11 @@ SOURCE=.\libgd\gd_topal.c
 \r
 SOURCE=.\libgd\gd_wbmp.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -353,11 +353,11 @@ SOURCE=.\libgd\gd_wbmp.c
 \r
 SOURCE=.\libgd\gdcache.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -368,11 +368,11 @@ SOURCE=.\libgd\gdcache.c
 \r
 SOURCE=.\libgd\gdfontg.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -383,11 +383,11 @@ SOURCE=.\libgd\gdfontg.c
 \r
 SOURCE=.\libgd\gdfontl.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -398,11 +398,11 @@ SOURCE=.\libgd\gdfontl.c
 \r
 SOURCE=.\libgd\gdfontmb.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -413,11 +413,11 @@ SOURCE=.\libgd\gdfontmb.c
 \r
 SOURCE=.\libgd\gdfonts.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -428,11 +428,11 @@ SOURCE=.\libgd\gdfonts.c
 \r
 SOURCE=.\libgd\gdfontt.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -443,11 +443,11 @@ SOURCE=.\libgd\gdfontt.c
 \r
 SOURCE=.\libgd\gdft.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -458,11 +458,11 @@ SOURCE=.\libgd\gdft.c
 \r
 SOURCE=.\libgd\gdhelpers.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -473,11 +473,11 @@ SOURCE=.\libgd\gdhelpers.c
 \r
 SOURCE=.\libgd\gdkanji.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -488,11 +488,11 @@ SOURCE=.\libgd\gdkanji.c
 \r
 SOURCE=.\libgd\gdtables.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -503,11 +503,11 @@ SOURCE=.\libgd\gdtables.c
 \r
 SOURCE=.\libgd\gdxpm.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r
@@ -518,11 +518,11 @@ SOURCE=.\libgd\gdxpm.c
 \r
 SOURCE=.\libgd\wbmp.c\r
 \r
-!IF  "$(CFG)" == "gd - Win32 Release_TS GD2 bundled"\r
+!IF  "$(CFG)" == "gd_bundled - Win32 Release_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Release_TS_bundled"\r
 \r
-!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2 bundled"\r
+!ELSEIF  "$(CFG)" == "gd_bundled - Win32 Debug_TS GD2"\r
 \r
 # PROP Intermediate_Dir "Debug_TS_bundled"\r
 \r

diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw
index ffea0ce774c26d030556b06d8fd1c47d669cf179..92188c4d8b38182c170367c1a57ddd472cfeb00d 100644 (file)
--- a/win32/php_modules.dsw
+++ b/win32/php_modules.dsw
@@ -195,6 +195,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "gd_bundled"=..\ext\gd\gd_bundled.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "gettext"=..\ext\gettext\gettext.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r