From: Zeev Suraski Date: Sun, 19 Dec 1999 21:02:54 +0000 (+0000) Subject: libzend -> Zend X-Git-Tag: PRE_ISSET_TYPE~171 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d2b0715d1d7ffa71b82c07bc8349047cae6c764;p=php libzend -> Zend --- diff --git a/ChangeLog b/ChangeLog index e432508994..fa7cf42bc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -245,7 +245,7 @@ * build.mk configure.in: - Build structure change. Instead of using an external configure for libzend + Build structure change. Instead of using an external configure for Zend and TSRM, the core code of these configures was separated into extra m4 files which we can now include into PHP's configure. Advantages: @@ -875,7 +875,7 @@ * ext/standard/config.h.stub ext/standard/dl.c - ext/standard/dl.h: in libzend). + ext/standard/dl.h: in Zend). 1999-12-04 Sascha Schumann @@ -1292,7 +1292,7 @@ * sapi/servlet/config.m4: use new PHP_BUILD_THREAD_SAFE macro * ext/standard/parsedate.y: - libzend/zend_compile.h's #define YYSTYPE causes parsedate to barf on Windows + Zend/zend_compile.h's #define YYSTYPE causes parsedate to barf on Windows 1999-12-01 Thies C. Arntzen @@ -1432,7 +1432,7 @@ 1999-11-29 Sascha Schumann * sapi/aolserver/aolserver.c: - Revert last patch (leak in libzend is fixed now) + Revert last patch (leak in Zend is fixed now) 1999-11-29 Stig Bakken @@ -2181,7 +2181,7 @@ * NEWS ext/standard/array.c: - (PHP k[r]sort) now use compare_function from libzend to be consistent with the language-core. + (PHP k[r]sort) now use compare_function from Zend to be consistent with the language-core. 1999-11-14 Andi Gutmans @@ -2538,7 +2538,7 @@ - PHP-specific changes are easier to maintain - it removes one dependency for users (i.e. GNU vs. FreeBSD ports) - I have not removed the libtool check in buildconf, since libzend/TSRM still + I have not removed the libtool check in buildconf, since Zend/TSRM still depend on a local version of libtool. * ext/snmp/snmp.c: @@ -3248,7 +3248,7 @@ * build.mk: (build.mk) fix suggested by sascha. * build.mk: - (build.mk) make cvsclean now also deletes the libzend & TSRM symlinks. + (build.mk) make cvsclean now also deletes the Zend & TSRM symlinks. 1999-10-10 Sascha Schumann @@ -4156,7 +4156,7 @@ * configure.in.in Makefile.in: - Now thread safe version builds out of the box. libzend/TSRM + Now thread safe version builds out of the box. Zend/TSRM contain extra config scripts which pass the necessary libs back to our Makefile. @@ -6797,7 +6797,7 @@ ext/com/COM.c: - Fix the new operator incompatibility. - I commented PHP_FUNCTION(strtotime) in datetime.c because it stopped win32 from compiling. This needs to be fixed!!! - - Check out libzend to compile the tree now. + - Check out Zend to compile the tree now. 1999-07-25 Stig Bakken @@ -6947,7 +6947,7 @@ 1999-07-23 Zeev Suraski - * ext/gd/gd.c: Fix bug #1807 (requires libzend update) + * ext/gd/gd.c: Fix bug #1807 (requires Zend update) 1999-07-23 Sascha Schumann @@ -7028,7 +7028,7 @@ 1999-07-22 Stig Bakken * buildconf: - add checks for autoconf, automake and whether libzend/TSRM is around + add checks for autoconf, automake and whether Zend/TSRM is around 1999-07-22 Sascha Schumann @@ -8553,13 +8553,13 @@ * Makefile.in configure.in.in: - fix APXS VPATH build - - libzend/TSRM build in their own directories + - Zend/TSRM build in their own directories - ext/Makefile was generated twice ****NOTE****** If you use any kind of VPATH, you need to do a "make distclean" in your - libzend/TSRM directory, before running configure again. + Zend/TSRM directory, before running configure again. 1999-05-29 Zeev Suraski @@ -8825,7 +8825,7 @@ * cgi_main.c main.c: * Minor fixes - * Better handling for multiple repeated memory leaks (libzend updated) + * Better handling for multiple repeated memory leaks (Zend updated) * ext/apache/apache.c apMakefile.tmpl @@ -9279,7 +9279,7 @@ php_regex.h request_info.c snprintf.c: * Get Apache to work. POST doesn't work yet. - * There are now -I directives for the absolute path of php4, php4/libzend and the builddir for + * There are now -I directives for the absolute path of php4, php4/Zend and the builddir for the Apache module, so we can #include any php/Zend header. * Rename config.h to php_config.h @@ -9498,7 +9498,7 @@ * acconfig.h.in configure.in.in: ZTS fixes - Stig - --enable-thread-safety belongs in libzend, since libzend doesn't #include config.h, whereas + Stig - --enable-thread-safety belongs in Zend, since Zend doesn't #include config.h, whereas PHP does #include zend_config.h 1999-05-03 Zeev Suraski @@ -9823,7 +9823,7 @@ configure.in.in ext/ldap/config.m4: Ok, this beast compiles via --with-apxs Not sure if it actually works yet though. I have a feeling there are - some -fpic flags missing in the libzend build. Will test later on + some -fpic flags missing in the Zend build. Will test later on today. 1999-04-25 Sascha Schumann @@ -10548,7 +10548,7 @@ 1999-04-19 Stig Bakken - * buildconf: convert libzend to automake + * buildconf: convert Zend to automake 1999-04-19 Andi Gutmans @@ -10603,7 +10603,7 @@ moved dbase into ext/ along with the bundled library dbase programs are no longer included - * buildconf: run automake and run autoconf in libzend + * buildconf: run automake and run autoconf in Zend 1999-04-18 Zeev Suraski @@ -10759,10 +10759,10 @@ sub-directories and started to move extension code into ext/. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. - The configure script now also runs configure in the libzend directory - automatically and makes sure php4 and libzend use the same config.cache file. - To avoid running configure in libzend, use the --no-recursion option. - "make" in php4 also builds libzend now. + The configure script now also runs configure in the Zend directory + automatically and makes sure php4 and Zend use the same config.cache file. + To avoid running configure in Zend, use the --no-recursion option. + "make" in php4 also builds Zend now. The Apache module doesn't compile right now, but a fix for that is coming up. diff --git a/Makefile.am b/Makefile.am index 6a07e0e363..a5fedaf149 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign -ZEND_DIR = $(srcdir)/libzend -SUBDIRS = libzend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) +ZEND_DIR = $(srcdir)/Zend +SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) BUILDLDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) @@ -14,7 +14,7 @@ libphp4_la_SOURCES = \ strlcat.c mergesort.c reentrancy.c libphp4_la_DEPENDENCIES = \ - libzend/libzend.la \ + Zend/libZend.la \ sapi/$(PHP_SAPI)/libphpsapi_$(PHP_SAPI).la \ $(REGEX_LIB) \ $(EXT_LTLIBS) \ diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 6469df64b1..9a78e162d3 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -3,13 +3,13 @@ #CLEANFILES = zend-parser.c zend-parser.h zend-scanner.c zend-parser.output AUTOMAKE_OPTIONS=foreign -EXTRA_LTLIBRARIES=libzend_cc.la libzend_c.la -noinst_LTLIBRARIES=$(ZEND_SCANNER) libzend.la +EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la +noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la -libzend_cc_la_SOURCES=zend-scanner-cc.cc -libzend_c_la_SOURCES=zend-scanner.c +libZend_cc_la_SOURCES=zend-scanner-cc.cc +libZend_c_la_SOURCES=zend-scanner.c -libzend_la_SOURCES=\ +libZend_la_SOURCES=\ zend-parser.y \ zend_alloc.c zend_compile.c zend_constants.c \ zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \ @@ -17,9 +17,9 @@ libzend_la_SOURCES=\ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c -libzend_la_LIBADD = $(ZEND_SCANNER) -libzend_la_LDFLAGS = @EXTRA_LIBS@ -libzend_la_DEPENDENCIES = $(ZEND_SCANNER) +libZend_la_LIBADD = $(ZEND_SCANNER) +libZend_la_LDFLAGS = @EXTRA_LIBS@ +libZend_la_DEPENDENCIES = $(ZEND_SCANNER) # automake isn't too clever about "non-standard" use of lex and yacc diff --git a/Zend/libzend.dsp b/Zend/Zend.dsp similarity index 91% rename from Zend/libzend.dsp rename to Zend/Zend.dsp index 34336ce277..9aabe0998b 100644 --- a/Zend/libzend.dsp +++ b/Zend/Zend.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libzend" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="Zend" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=libzend - Win32 Debug +CFG=Zend - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "libzend.mak". +!MESSAGE NMAKE /f "libZend.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "libzend.mak" CFG="libzend - Win32 Debug" +!MESSAGE NMAKE /f "libZend.mak" CFG="Zend - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libzend - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libzend - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=libzend - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "libzend - Win32 Release" +!IF "$(CFG)" == "Zend - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Output_Dir "Release" @@ -50,7 +50,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "libzend - Win32 Debug" +!ELSEIF "$(CFG)" == "Zend - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Output_Dir "Debug" @@ -75,8 +75,8 @@ LIB32=link.exe -lib # Begin Target -# Name "libzend - Win32 Release" -# Name "libzend - Win32 Debug" +# Name "Zend - Win32 Release" +# Name "Zend - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -276,7 +276,7 @@ SOURCE=.\zend_variables.h SOURCE=".\zend-parser.y" -!IF "$(CFG)" == "libzend - Win32 Release" +!IF "$(CFG)" == "Zend - Win32 Release" # Begin Custom Build InputDir=. @@ -293,7 +293,7 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "libzend - Win32 Debug" +!ELSEIF "$(CFG)" == "Zend - Win32 Debug" # Begin Custom Build InputDir=. @@ -321,7 +321,7 @@ BuildCmds= \ SOURCE=".\zend-scanner.l" -!IF "$(CFG)" == "libzend - Win32 Release" +!IF "$(CFG)" == "Zend - Win32 Release" # Begin Custom Build InputPath=".\zend-scanner.l" @@ -331,7 +331,7 @@ InputPath=".\zend-scanner.l" # End Custom Build -!ELSEIF "$(CFG)" == "libzend - Win32 Debug" +!ELSEIF "$(CFG)" == "Zend - Win32 Debug" # Begin Custom Build InputPath=".\zend-scanner.l" diff --git a/Zend/libzend.m4 b/Zend/Zend.m4 similarity index 98% rename from Zend/libzend.m4 rename to Zend/Zend.m4 index aa3ed9e9e9..d64d580724 100644 --- a/Zend/libzend.m4 +++ b/Zend/Zend.m4 @@ -159,7 +159,7 @@ else ZEND_SCANNER_TYPE=c fi -ZEND_SCANNER="libzend_${ZEND_SCANNER_TYPE}.la" +ZEND_SCANNER="libZend_${ZEND_SCANNER_TYPE}.la" if test "$ZEND_MEMORY_LIMIT" = "yes"; then AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit]) diff --git a/Zend/libzendts.dsp b/Zend/ZendTS.dsp similarity index 90% rename from Zend/libzendts.dsp rename to Zend/ZendTS.dsp index 70e6e35021..f0768796c9 100644 --- a/Zend/libzendts.dsp +++ b/Zend/ZendTS.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libzendts" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="ZendTS" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=libzendts - Win32 Debug_TS +CFG=ZendTS - Win32 Debug_TS !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "libzendts.mak". +!MESSAGE NMAKE /f "ZendTS.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "libzendts.mak" CFG="libzendts - Win32 Debug_TS" +!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Debug_TS" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libzendts - Win32 Release_TS" (based on "Win32 (x86) Static Library") -!MESSAGE "libzendts - Win32 Debug_TS" (based on "Win32 (x86) Static Library") +!MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library") +!MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=libzendts - Win32 Debug_TS CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "libzendts - Win32 Release_TS" +!IF "$(CFG)" == "ZendTS - Win32 Release_TS" # PROP BASE Use_MFC 0 # PROP BASE Output_Dir "Release_TS" @@ -50,7 +50,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "libzendts - Win32 Debug_TS" +!ELSEIF "$(CFG)" == "ZendTS - Win32 Debug_TS" # PROP BASE Use_MFC 0 # PROP BASE Output_Dir "Debug_TS" @@ -75,8 +75,8 @@ LIB32=link.exe -lib # Begin Target -# Name "libzendts - Win32 Release_TS" -# Name "libzendts - Win32 Debug_TS" +# Name "ZendTS - Win32 Release_TS" +# Name "ZendTS - Win32 Debug_TS" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -280,7 +280,7 @@ SOURCE=.\zend_variables.h SOURCE=".\zend-parser.y" -!IF "$(CFG)" == "libzendts - Win32 Release_TS" +!IF "$(CFG)" == "ZendTS - Win32 Release_TS" # Begin Custom Build InputDir=. @@ -298,7 +298,7 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "libzendts - Win32 Debug_TS" +!ELSEIF "$(CFG)" == "ZendTS - Win32 Debug_TS" # Begin Custom Build InputDir=. @@ -327,7 +327,7 @@ BuildCmds= \ SOURCE=".\zend-scanner.l" -!IF "$(CFG)" == "libzendts - Win32 Release_TS" +!IF "$(CFG)" == "ZendTS - Win32 Release_TS" # Begin Custom Build InputPath=".\zend-scanner.l" @@ -337,7 +337,7 @@ InputPath=".\zend-scanner.l" # End Custom Build -!ELSEIF "$(CFG)" == "libzendts - Win32 Debug_TS" +!ELSEIF "$(CFG)" == "ZendTS - Win32 Debug_TS" # Begin Custom Build InputPath=".\zend-scanner.l" diff --git a/Zend/configure.in b/Zend/configure.in index 411659dfbd..50ead57d93 100644 --- a/Zend/configure.in +++ b/Zend/configure.in @@ -14,7 +14,7 @@ ZEND_VERSION=$VERSION dnl We want this one before the checks, so the checks can modify CFLAGS. test -z "$CFLAGS" && auto_cflags=1 -sinclude(libzend.m4) +sinclude(Zend.m4) LIBZEND_BASIC_CHECKS diff --git a/build.mk b/build.mk index d710c46ddc..2b3fb07c91 100644 --- a/build.mk +++ b/build.mk @@ -12,7 +12,7 @@ # $Id$ -SUBDIRS = libzend TSRM +SUBDIRS = Zend TSRM STAMP = buildmk.stamp @@ -24,12 +24,12 @@ all: $(STAMP) $(ALWAYS) @$(MAKE) -s -f build2.mk generated_lists: - @echo makefile_am_files = Makefile.am libzend/Makefile.am \ + @echo makefile_am_files = Makefile.am Zend/Makefile.am \ TSRM/Makefile.am `find ext sapi regex pear -name Makefile.am` > $@ - @echo config_h_files = libzend/acconfig.h TSRM/acconfig.h \ + @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h \ ext/*/config.h.stub sapi/*/config.h.stub >> $@ - @echo config_m4_files = libzend/libzend.m4 TSRM/tsrm.m4 \ - libzend/acinclude.m4 ext/*/config.m4 sapi/*/config.m4 >> $@ + @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 \ + Zend/acinclude.m4 ext/*/config.m4 sapi/*/config.m4 >> $@ $(STAMP): buildcheck.sh @./buildcheck.sh && touch $(STAMP) diff --git a/build2.mk b/build2.mk index eeeb9ef3e9..7ebe0c3078 100644 --- a/build2.mk +++ b/build2.mk @@ -16,10 +16,10 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files) targets = $(makefile_in_files) configure $(config_h_in) -all: libzend/Makefile.am TSRM/Makefile.am $(targets) +all: Zend/Makefile.am TSRM/Makefile.am $(targets) -libzend/Makefile.am: - test -d libzend || (test -d ../libzend && ln -s ../libzend libzend) +Zend/Makefile.am: + test -d Zend || (test -d ../Zend && ln -s ../Zend Zend) TSRM/Makefile.am: test -d TSRM || (test -d ../TSRM && ln -s ../TSRM TSRM) diff --git a/configure.in b/configure.in index e1b051e4d9..5419a11322 100644 --- a/configure.in +++ b/configure.in @@ -111,8 +111,8 @@ if test "$ac_cv_c_const" = "yes" ; then fi AC_SUBST(LEX_CFLAGS) -sinclude(libzend/acinclude.m4) -sinclude(libzend/libzend.m4) +sinclude(Zend/acinclude.m4) +sinclude(Zend/Zend.m4) sinclude(TSRM/tsrm.m4) dnl check for -R, etc. switch @@ -156,7 +156,7 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi -INCLUDES="-I\$(top_builddir)/libzend -I\$(top_srcdir) -I\$(top_srcdir)/libzend" +INCLUDES="-I\$(top_builddir)/Zend -I\$(top_srcdir) -I\$(top_srcdir)/Zend" AC_SUBST(INCLUDES) AC_CHECK_LIB(nsl, gethostname, [ @@ -755,7 +755,7 @@ if test "$PHP_THREAD_SAFETY" = "yes"; then fi #libphp4.module -AC_OUTPUT([Makefile php4.spec libzend/Makefile ext/Makefile sapi/Makefile pear/Makefile +AC_OUTPUT([Makefile php4.spec Zend/Makefile ext/Makefile sapi/Makefile pear/Makefile $PHP_OUTPUT_FILES scripts/mkextlib build-defs.h], [], [ @@ -767,7 +767,7 @@ if test ! -f $srcdir/ext/bcmath/number.c; then fi test -d TSRM && echo '#include "../php_config.h"' > TSRM/tsrm_config.h -echo '#include "../php_config.h"' > libzend/zend_config.h +echo '#include "../php_config.h"' > Zend/zend_config.h # run this only when generating all the files? if true; then diff --git a/dlist.c b/dlist.c index ea707fc6fb..9a371672d6 100644 --- a/dlist.c +++ b/dlist.c @@ -18,12 +18,15 @@ * ----------------- * * $Log$ +* Revision 1.2 1999/08/23 19:43:01 sas +* malloc.h is deprecated, use stdlib.h instead +* * Revision 1.1 1999/07/19 18:58:44 andrey * Moving dlist stuff into core. * * Revision 1.2 1999/05/11 00:01:42 zeev * * Get Apache to work. POST doesn't work yet. -* * There are now -I directives for the absolute path of php4, php4/libzend and the builddir for +* * There are now -I directives for the absolute path of php4, php4/Zend and the builddir for * the Apache module, so we can #include any php/Zend header. * * Rename config.h to php_config.h * diff --git a/ext/bcmath/Makefile.am b/ext/bcmath/Makefile.am index e73bafce78..762104ad75 100644 --- a/ext/bcmath/Makefile.am +++ b/ext/bcmath/Makefile.am @@ -1,5 +1,5 @@ # $Id$ -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=libphpext_bcmath.la libphpext_bcmath_la_SOURCES=bcmath.c number.c diff --git a/ext/informix/ifx.dsp b/ext/informix/ifx.dsp index 66afa15262..043ae9edbf 100644 --- a/ext/informix/ifx.dsp +++ b/ext/informix/ifx.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D "ZTS" /YX /FD /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" " " " " " " /c +# 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 "ZTS" /YX /FD /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" " " " " " " /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\libzend" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D "ZTS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x406 /d "_DEBUG" diff --git a/ext/java/Makefile.am b/ext/java/Makefile.am index 6ac8130dca..14fd3a1965 100644 --- a/ext/java/Makefile.am +++ b/ext/java/Makefile.am @@ -3,7 +3,7 @@ SRC=java.c CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend EXTRA_LTLIBRARIES=libphp_java.la phplib_LTLIBRARIES=@JAVA_SHARED@ libphp_java_la_SOURCES=$(SRC) diff --git a/ext/java/java.dsp b/ext/java/java.dsp index 069e068389..f413b7f8fb 100644 --- a/ext/java/java.dsp +++ b/ext/java/java.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -96,8 +96,8 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" diff --git a/ext/mssql/mssql.dsp b/ext/mssql/mssql.dsp index 06481d785d..dbb62ab7a5 100644 --- a/ext/mssql/mssql.dsp +++ b/ext/mssql/mssql.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\libzend\\" /I "..\..\..\bindlib_w32\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\Zend\\" /I "..\..\..\bindlib_w32\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "_DEBUG" @@ -96,8 +96,8 @@ LINK32=link.exe # PROP Intermediate_Dir "MSSQL_65_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-65" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL65=1 /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-65" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL65=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -123,8 +123,8 @@ LINK32=link.exe # PROP Intermediate_Dir "MSSQL_70_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL70=1 /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL70=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" diff --git a/ext/mysql/Makefile.am b/ext/mysql/Makefile.am index 0bf2a7ddeb..952963ea97 100644 --- a/ext/mysql/Makefile.am +++ b/ext/mysql/Makefile.am @@ -1,7 +1,7 @@ # $Id$ SRC=php_mysql.c -INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@MYSQL_STATIC@ EXTRA_LTLIBRARIES=libphpext_mysql.la mysql.la libphpext_mysql_la_SOURCES=$(SRC) diff --git a/ext/mysql/mysql.dsp b/ext/mysql/mysql.dsp index 72615ac020..29be1ca7e6 100644 --- a/ext/mysql/mysql.dsp +++ b/ext/mysql/mysql.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -96,8 +96,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /FR /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" diff --git a/ext/pgsql/Makefile.am b/ext/pgsql/Makefile.am index 1fe55e8517..6d6306cb27 100644 --- a/ext/pgsql/Makefile.am +++ b/ext/pgsql/Makefile.am @@ -1,7 +1,7 @@ # $Id$ SRC=pgsql.c -INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@PGSQL_STATIC@ EXTRA_LTLIBRARIES=libphpext_pgsql.la pgsql.la libphpext_pgsql_la_SOURCES=$(SRC) diff --git a/ext/pgsql/pgsql.dsp b/ext/pgsql/pgsql.dsp index b421af5e56..451b9bf286 100644 --- a/ext/pgsql/pgsql.dsp +++ b/ext/pgsql/pgsql.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /D HAVE_PGSQL=1 /D "COMPILE_DL" /D "ZTS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /D HAVE_PGSQL=1 /D "COMPILE_DL" /D "ZTS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 diff --git a/ext/rpc/Makefile.am b/ext/rpc/Makefile.am index 6ac8130dca..14fd3a1965 100644 --- a/ext/rpc/Makefile.am +++ b/ext/rpc/Makefile.am @@ -3,7 +3,7 @@ SRC=java.c CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend EXTRA_LTLIBRARIES=libphp_java.la phplib_LTLIBRARIES=@JAVA_SHARED@ libphp_java_la_SOURCES=$(SRC) diff --git a/ext/rpc/java/Makefile.am b/ext/rpc/java/Makefile.am index 6ac8130dca..14fd3a1965 100644 --- a/ext/rpc/java/Makefile.am +++ b/ext/rpc/java/Makefile.am @@ -3,7 +3,7 @@ SRC=java.c CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend EXTRA_LTLIBRARIES=libphp_java.la phplib_LTLIBRARIES=@JAVA_SHARED@ libphp_java_la_SOURCES=$(SRC) diff --git a/ext/rpc/java/java.dsp b/ext/rpc/java/java.dsp index 069e068389..f413b7f8fb 100644 --- a/ext/rpc/java/java.dsp +++ b/ext/rpc/java/java.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -96,8 +96,8 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" diff --git a/ext/snmp/Makefile.am b/ext/snmp/Makefile.am index 63afdb9a92..5f7da80286 100644 --- a/ext/snmp/Makefile.am +++ b/ext/snmp/Makefile.am @@ -1,7 +1,7 @@ # $Id$ SRC=snmp.c -INCLUDES=@INCLUDES@ @SNMP_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @SNMP_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@SNMP_STATIC@ EXTRA_LTLIBRARIES=libphpext_snmp.la snmp.la libphpext_snmp_la_SOURCES=$(SRC) diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am index 2299ba2ce0..504e4c6d9b 100644 --- a/ext/xml/Makefile.am +++ b/ext/xml/Makefile.am @@ -1,7 +1,7 @@ # $Id$ SRC=xml.c -INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@XML_STATIC@ EXTRA_LTLIBRARIES=libphpext_xml.la xml.la libphpext_xml_la_SOURCES=$(SRC) diff --git a/genfiles b/genfiles index c83dd825d4..fa79ef092f 100755 --- a/genfiles +++ b/genfiles @@ -2,6 +2,6 @@ STD='make -f Makefile.am LEX=flex YACC="bison -y" srcdir=.' -(cd libzend && eval "$STD zend-parser.c zend-scanner.c zend-scanner-cc.cc") +(cd Zend && eval "$STD zend-parser.c zend-scanner.c zend-scanner-cc.cc") eval "$STD configuration-parser.c configuration-scanner.c" (cd ext/standard && eval "$STD parsedate.c") diff --git a/main/main.c b/main/main.c index 0d49e271fd..2524c235df 100644 --- a/main/main.c +++ b/main/main.c @@ -81,7 +81,7 @@ PHPAPI int core_globals_id; #define NO_GLOBAL_LOCK -/* temporary workaround for thread-safety issues in libzend */ +/* temporary workaround for thread-safety issues in Zend */ #if defined(ZTS) && !defined(NO_GLOBAL_LOCK) static MUTEX_T global_lock; #define global_lock() tsrm_mutex_lock(global_lock) diff --git a/makedist b/makedist index f10e342cae..b6efe7f60a 100755 --- a/makedist +++ b/makedist @@ -30,7 +30,7 @@ PHPROOT=:pserver:cvsread@cvs.php.net:/repository ZENDROOT=:pserver:cvsread@cvs.zend.com:/repository PHPMOD=php4 -ZENDMOD=libzend +ZENDMOD=Zend TSRMMOD=TSRM LT_TARGETS='ltconfig ltmain.sh config.guess config.sub' diff --git a/php4.dsp b/php4.dsp index a158b8c8f6..06113026bc 100644 --- a/php4.dsp +++ b/php4.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "libzend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "libzend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" diff --git a/php4.dsw b/php4.dsw index c14719887c..26261a2321 100644 --- a/php4.dsw +++ b/php4.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "libzend"=..\libzend\libzend.dsp - Package Owner=<4> +Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4> Package=<5> {{{ @@ -39,7 +39,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libzend + Project_Dep_Name Zend End Project Dependency }}} diff --git a/php4dll.dsp b/php4dll.dsp index a51ceb99c4..6162481726 100644 --- a/php4dll.dsp +++ b/php4dll.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzend.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"libzend\Debug" /libpath:"..\bindlib_w32\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libZend.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"Zend\Debug" /libpath:"..\bindlib_w32\Debug" !ELSEIF "$(CFG)" == "php4dll - Win32 Release" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"libzend\Release" /libpath:"..\bindlib_w32\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libZend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release" !ENDIF diff --git a/php4dllts.dsp b/php4dllts.dsp index a0b899941a..2c50090e6c 100644 --- a/php4dllts.dsp +++ b/php4dllts.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzendts.lib TSRM.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"libzend\Debug_TS" /libpath:"..\bindlib_w32\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"..\bindlib_w32\Debug" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzendts.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"libzend\Release_TS" /libpath:"..\bindlib_w32\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" !ENDIF diff --git a/php4ts.dsp b/php4ts.dsp index 267922c801..ea1393497a 100644 --- a/php4ts.dsp +++ b/php4ts.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" diff --git a/php4ts.dsw b/php4ts.dsw index 86c8fb312b..519a96a539 100644 --- a/php4ts.dsw +++ b/php4ts.dsw @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "libzendts"=.\libzend\libzendts.dsp - Package Owner=<4> +Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4> Package=<5> {{{ @@ -39,7 +39,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libzendts + Project_Dep_Name ZendTS End Project Dependency Begin Project Dependency Project_Dep_Name TSRM diff --git a/sapi/apache/Makefile.am b/sapi/apache/Makefile.am index 38404758dc..8a56e9e19c 100644 --- a/sapi/apache/Makefile.am +++ b/sapi/apache/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in APACHE_INCLUDE=@APACHE_INCLUDE@ -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend $(APACHE_INCLUDE) +INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/Zend $(APACHE_INCLUDE) noinst_LTLIBRARIES=libphpsapi_apache.la libphpsapi_apache_la_SOURCES=sapi_apache.c mod_php4.c diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in index 2513a7b48d..4c90861a65 100644 --- a/sapi/apache/libphp4.module.in +++ b/sapi/apache/libphp4.module.in @@ -3,5 +3,5 @@ ConfigStart RULE_WANTHSREGEX=@APACHE_WANT_HSREGEX@ LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS" RULE_HIDE=yes - CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@" + CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/Zend -I@abs_builddir@/Zend -I@abs_builddir@" ConfigEnd diff --git a/sapi/isapi/php4isapi.dsp b/sapi/isapi/php4isapi.dsp index caef60e9af..0fe2d428be 100644 --- a/sapi/isapi/php4isapi.dsp +++ b/sapi/isapi/php4isapi.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\libzend" /I "..\.." /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "COMPILE_LIBZEND" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "COMPILE_LIBZEND" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\libzend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" diff --git a/sapi/servlet/Makefile.am b/sapi/servlet/Makefile.am index d729f60a4c..11103e5541 100644 --- a/sapi/servlet/Makefile.am +++ b/sapi/servlet/Makefile.am @@ -3,7 +3,7 @@ SRC=servlet.c java.c CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=libphpsapi_servlet.la libphpsapi_servlet_la_SOURCES=$(SRC) diff --git a/sapi/servlet/servlet.dsp b/sapi/servlet/servlet.dsp index 4dca8ce049..472855a5ae 100644 --- a/sapi/servlet/servlet.dsp +++ b/sapi/servlet/servlet.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -96,8 +96,8 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw index 9ca4b269e7..e7fb42fc65 100644 --- a/win32/php_modules.dsw +++ b/win32/php_modules.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "libzendts"=.\libzend\libzendts.dsp - Package Owner=<4> +Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4> Package=<5> {{{