- Informix driver : Changes for new "main" directory (win32 build)

diff --git a/ext/informix/ifx.dsp b/ext/informix/ifx.dsp
index 460f4aa7e11d481c2475873970f2c4b0e99c7bfd..3cb08ecc2d1456c42d5ae79b5a20a9e591dd2705 100644 (file)
--- a/ext/informix/ifx.dsp
+++ b/ext/informix/ifx.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D HAVE_IUS=1 /D "ZTS" /D ZEND_WIN32=1 /D PHP_WIN32=1 /D IFX_VERSION=921 /D COMPILE_DL_INFORMIX=1 /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\main" /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D HAVE_IUS=1 /D "ZTS" /D ZEND_WIN32=1 /D PHP_WIN32=1 /D IFX_VERSION=921 /D COMPILE_DL_INFORMIX=1 /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r

diff --git a/ext/informix/ifx_custom_build.dsp b/ext/informix/ifx_custom_build.dsp
index b26a679fb68fc40932cbd249324fbfe48aa7297c..2b906607a6bad8cc4acb2198d1ee1b9c3b358ac3 100644 (file)
--- a/ext/informix/ifx_custom_build.dsp
+++ b/ext/informix/ifx_custom_build.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="ifx_custom_build" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 5.00\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
@@ -17,16 +17,16 @@ CFG=ifx_custom_build - Win32 Release
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "ifx_custom_build - Win32 Release" (based on\\r
- "Win32 (x86) Static Library")\r
-!MESSAGE "ifx_custom_build - Win32 Debug" (based on\\r
- "Win32 (x86) Static Library")\r
+!MESSAGE "ifx_custom_build - Win32 Release" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "ifx_custom_build - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
 # PROP Scc_ProjName ""\r
 # PROP Scc_LocalPath ""\r
 CPP=cl.exe\r
+RSC=rc.exe\r
 \r
 !IF  "$(CFG)" == "ifx_custom_build - Win32 Release"\r
 \r
@@ -40,11 +40,10 @@ CPP=cl.exe
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
-RSC=rc.exe\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
 # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
+# ADD BASE RSC /l 0x409\r
+# ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -64,11 +63,10 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
-RSC=rc.exe\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409 /i "c:\include"\r
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
 # ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
+# ADD BASE RSC /l 0x409\r
+# ADD RSC /l 0x409 /i "c:\include"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
@@ -92,7 +90,7 @@ SOURCE=.\ifx.ec
 InputPath=.\ifx.ec\r
 \r
 "ifx.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       esql.exe -dcmdl -p -G -subsystem:windows -thread -I..\.. ifx.ec\r
+       esql.exe -dcmdl -p -G -subsystem:windows -thread -I..\..\main ifx.ec\r
 \r
 # End Custom Build\r
 \r