diff options
Diffstat (limited to 'auto/lib/pcre')
| -rw-r--r-- | auto/lib/pcre/conf | 13 | ||||
| -rw-r--r-- | auto/lib/pcre/make | 24 | ||||
| -rw-r--r-- | auto/lib/pcre/makefile.bcc | 17 |
3 files changed, 38 insertions, 16 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 972c10682..3f2c7a1f6 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -1,21 +1,12 @@ if [ $PCRE != NONE ]; then - CORE_INCS="$CORE_INCS -I $PCRE" + CORE_INCS="$CORE_INCS $PCRE" CORE_DEPS="$CORE_DEPS $REGEX_DEPS" CORE_SRCS="$CORE_SRCS $REGEX_SRCS" case "$CC" in - cl) - have=HAVE_PCRE . auto/have - have=PCRE_STATIC . auto/have - CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" - LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib" - CORE_LIBS="$CORE_LIBS pcre.lib" - CORE_LINK="$CORE_LINK -libpath:$PCRE" - ;; - - wcl386) + cl | wcl386 | bcc32) have=HAVE_PCRE . auto/have have=PCRE_STATIC . auto/have CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index 1f26f5b83..3a42eaba8 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -3,10 +3,17 @@ case "$CC" in cl) makefile=makefile.msvc + opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" ;; wcl386) makefile=makefile.owc + opt="CPU_OPT=$CPU_OPT" + ;; + + bcc32) + makefile=makefile.bcc + opt="-DCPU_OPT=$CPU_OPT" ;; esac @@ -19,14 +26,21 @@ case $PLATFORM in cp auto/lib/pcre/patch.config.in $PCRE cp auto/lib/pcre/$makefile $PCRE - echo "$PCRE/pcre.h:" >> $MAKEFILE - echo " cd $PCRE" >> $MAKEFILE + pcre=`echo $PCRE | sed -e "s/\//$DIRSEP/g"` + line=`echo $PCRE/pcre.h: | sed -e "s/\//$DIRSEP/g"` + + echo "$line" >> $MAKEFILE + echo " cd $pcre" >> $MAKEFILE echo " \$(MAKE) -f $makefile pcre.h" >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE echo >> $MAKEFILE - echo "$PCRE/pcre.lib: $PCRE/pcre.h" >> $MAKEFILE - echo " cd $PCRE" >> $MAKEFILE - echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE + + line="$PCRE/pcre.lib: $PCRE/pcre.h" + line=`echo $line | sed -e "s/\//$DIRSEP/g"` + + echo "$line" >> $MAKEFILE + echo " cd $pcre" >> $MAKEFILE + echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE ;; diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc new file mode 100644 index 000000000..5744b90b5 --- /dev/null +++ b/auto/lib/pcre/makefile.bcc @@ -0,0 +1,17 @@ + +CFLAGS = -q -O2 -tWM $(CPU_OPT) +PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 + + +pcre.lib: pcre.h + bcc32 -q -edftables dftables.c + + dftables > chartables.c + + bcc32 -c $(CFLAGS) $(PCREFLAGS) maketables.c get.c study.c pcre.c + + tlib pcre.lib +maketables.obj +get.obj +study.obj +pcre.obj + +pcre.h: + patch -o pcre.h pcre.in patch.pcre.in + patch -o config.h config.in patch.config.in |