summaryrefslogtreecommitdiffhomepage
path: root/auto/lib/pcre/make
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--auto/lib/pcre/make50
-rw-r--r--auto/lib/pcre/makefile.msvc14
-rw-r--r--auto/lib/pcre/makefile.owc14
3 files changed, 66 insertions, 12 deletions
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 836668619..6ea086da6 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -1,7 +1,47 @@
-echo "$PCRE/.libs/libpcre.a:" >> $MAKEFILE
-echo " cd $PCRE \\" >> $MAKEFILE
-echo " && ./configure --disable-shared \\" >> $MAKEFILE
-echo " && \$(MAKE)" >> $MAKEFILE
-echo >> $MAKEFILE
+case $CC in
+ cl)
+ makefile=makefile.msvc
+ ;;
+
+ wcl386)
+ makefile=makefile.owc
+ ;;
+
+esac
+
+
+case $PLATFORM in
+
+ win32)
+ echo "$PCRE/pcre.lib:" >> $MAKEFILE
+ ;;
+
+ *)
+ echo "$PCRE/.libs/libpcre.a:" >> $MAKEFILE
+ ;;
+
+esac
+
+
+case $PLATFORM in
+
+ win32)
+ cp auto/lib/pcre/patch.pcre $PCRE
+ cp auto/lib/pcre/patch.config $PCRE
+ cp auto/lib/pcre/$makefile $PCRE
+ echo " cd $PCRE" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile OWC_OPT=$OWC_OPT" >> $MAKEFILE
+ echo " cd ..\\..\\.." >> $MAKEFILE
+ ;;
+
+ *)
+ echo " cd $PCRE \\" >> $MAKEFILE
+ echo " && ./configure --disable-shared \\" >> $MAKEFILE
+ echo " && \$(MAKE)" >> $MAKEFILE
+ ;;
+
+esac
+
+echo >> $MAKEFILE
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index e5c2aec29..0eeb310ab 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -1,18 +1,18 @@
-CC = cl
CFLAGS = -O2 -Ob1 -Oi -Gs -MT
-LINK = link
-
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
-all:
- $(CC) -Fedftables dftables.c
+pcre.lib:
+ patch -o pcre.h pcre.in patch.pcre
+ patch -o config.h config.in patch.config
+
+ cl -Fedftables dftables.c
dftables > chartables.c
- $(CC) -nologo -c $(CFLAGS) $(PCREFLAGS) \
+ cl -nologo -c $(CFLAGS) $(PCREFLAGS) \
maketables.c get.c study.c pcre.c
- $(LINK) -lib -out:pcre.lib -verbose:lib \
+ link -lib -out:pcre.lib -verbose:lib \
maketables.obj get.obj study.obj pcre.obj
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
new file mode 100644
index 000000000..f4244a6c0
--- /dev/null
+++ b/auto/lib/pcre/makefile.owc
@@ -0,0 +1,14 @@
+
+CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(OWC_OPT)
+PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
+
+
+pcre.lib:
+ patch -o pcre.h pcre.in patch.pcre
+ patch -o config.h config.in patch.config
+
+ wcl386 -zq -bt=nt -l=nt -fe=dftables dftables.c
+ dftables > chartables.c
+
+ wcl386 $(CFLAGS) $(PCREFLAGS) maketables.c get.c study.c pcre.c
+ wlib -n pcre.lib maketables.obj get.obj study.obj pcre.obj