cvs: /php3/pcrelib pcrelib.dsp /php3/win32 pcre.dsp /php3 configuration-scanner.lex php3.dsw /php3/pcrelib .cvsignore /php3/win32 php_custom_build.dsp

jim Sat Aug 28 20:58:01 1999 EDT Added files: /php3/pcrelib pcrelib.dsp /php3/win32 pcre.dsp Modified files: /php3 configuration-scanner.lex php3.dsw /php3/pcrelib .cvsignore /php3/win32 php_custom_build.dsp Log: Clean up the Windows compile a bit, and add project for PCRE (compiles without a peep, but untested). Index: php3/configuration-scanner.lex diff -u php3/configuration-scanner.lex:1.34 php3/configuration-scanner.lex:1.35 --- php3/configuration-scanner.lex:1.34 Fri Jan 1 12:58:48 1999 +++ php3/configuration-scanner.lex Sat Aug 28 20:58:00 1999 @@ -29,6 +29,11 @@ #include "php.h" #include "configuration-parser.tab.h" +#if _WIN32 +/* These warnings are generated by flex. Ignore them. */ +# pragma warning(disable: 4101 4102) +#endif + #define YY_DECL cfglex(pval *cfglval) Index: php3/php3.dsw diff -u php3/php3.dsw:1.48 php3/php3.dsw:1.49 --- php3/php3.dsw:1.48 Mon Jun 28 17:43:29 1999 +++ php3/php3.dsw Sat Aug 28 20:58:00 1999 @@ -240,6 +240,36 @@ ############################################################################### +Project: "pcre"=.\win32\pcre.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name php3 + End Project Dependency + Begin Project Dependency + Project_Dep_Name pcrelib + End Project Dependency +}}} + +############################################################################### + +Project: "pcrelib"=.\pcrelib\pcrelib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "pdflib"=.\win32\pdflib.dsp - Package Owner=<4> Package=<5> Index: php3/pcrelib/.cvsignore diff -u php3/pcrelib/.cvsignore:1.1 php3/pcrelib/.cvsignore:1.2 --- php3/pcrelib/.cvsignore:1.1 Fri May 28 11:45:22 1999 +++ php3/pcrelib/.cvsignore Sat Aug 28 20:58:00 1999 @@ -1 +1,3 @@ Makefile +Debug +Release Index: php3/win32/php_custom_build.dsp diff -u php3/win32/php_custom_build.dsp:1.3 php3/win32/php_custom_build.dsp:1.4 --- php3/win32/php_custom_build.dsp:1.3 Fri Jul 16 14:05:01 1999 +++ php3/win32/php_custom_build.dsp Sat Aug 28 20:58:00 1999 @@ -86,11 +86,10 @@ !IF "$(CFG)" == "php_custom_build - Win32 Release" -# PROP Ignore_Default_Tool 1 # Begin Custom Build InputPath="..\configuration-parser.y" -"configuration-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"../configuration-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" set BISON_SIMPLE=bin\bison.simple bin\bison -d -p cfg ../configuration-parser.y -o ../configuration-parser.tab.c @@ -98,11 +97,10 @@ !ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug" -# PROP Ignore_Default_Tool 1 # Begin Custom Build InputPath="..\configuration-parser.y" -"configuration-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"../configuration-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" set BISON_SIMPLE=bin\bison.simple bin\bison -d -p cfg ../configuration-parser.y -o ../configuration-parser.tab.c @@ -117,7 +115,6 @@ !IF "$(CFG)" == "php_custom_build - Win32 Release" -# PROP Ignore_Default_Tool 1 # Begin Custom Build InputPath="..\configuration-scanner.lex" @@ -128,7 +125,6 @@ !ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug" -# PROP Ignore_Default_Tool 1 # Begin Custom Build InputPath="..\configuration-scanner.lex" @@ -188,7 +184,6 @@ !IF "$(CFG)" == "php_custom_build - Win32 Release" # PROP Intermediate_Dir "./" -# PROP Ignore_Default_Tool 1 # Begin Custom Build InputPath="..\language-scanner.lex" @@ -200,7 +195,6 @@ !ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug" # PROP Intermediate_Dir "./" -# PROP Ignore_Default_Tool 1 # Begin Custom Build InputPath="..\language-scanner.lex"