buildsys,mvc: Support packcc

k-takata · Jul 18, 2019 · adc1069 · adc1069
1 parent ff18000
commit adc1069
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/mk_mvc.mak b/mk_mvc.mak
@@ -10,14 +10,17 @@
 include source.mak
 
 OBJEXT = obj
-DEFINES = -DWIN32 -DHAVE_REGCOMP -D__USE_GNU -Dstrcasecmp=stricmp -DHAVE_REPOINFO_H
+DEFINES = -DWIN32 -DHAVE_REGCOMP -D__USE_GNU -Dstrcasecmp=stricmp -DHAVE_PACKCC -DHAVE_REPOINFO_H
 REGEX_DEFINES = -Dbool=int -Dfalse=0 -Dtrue=1 $(DEFINES)
 INCLUDES = -I. -Imain -Ignu_regex -Ifnmatch -Iparsers
 OPT = /O2 /WX
+PACKCC = packcc.exe
 REGEX_OBJS = $(REGEX_SRCS:.c=.obj)
 FNMATCH_OBJS = $(FNMATCH_SRCS:.c=.obj)
 WIN32_OBJS = $(WIN32_SRCS:.c=.obj)
-ALL_OBJS = $(ALL_SRCS:.c=.obj) $(REGEX_OBJS) $(FNMATCH_OBJS) $(WIN32_OBJS)
+PEG_OBJS = $(PEG_SRCS:.c=.obj)
+PACKCC_OBJS = $(PACKCC_SRCS:.c=.obj)
+ALL_OBJS = $(ALL_SRCS:.c=.obj) $(REGEX_OBJS) $(FNMATCH_OBJS) $(WIN32_OBJS) $(PEG_OBJS)
 READTAGS_OBJS = $(READTAGS_SRCS:.c=.obj)
 
 !if "$(WITH_ICONV)" == "yes"
@@ -42,6 +45,8 @@ PDBFLAG =
 !if [win32\gen-repoinfo.bat $(REPOINFO_HEADS)]
 !endif
 
+.SUFFIXES: .peg
+
 {main}.c{main}.obj::
 	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Fomain\ /c $<
 {optlib}.c{optlib}.obj::
@@ -54,12 +59,16 @@ PDBFLAG =
 	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Foread\ /c $<
 {win32\mkstemp}.c{win32\mkstemp}.obj::
 	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Fowin32\mkstemp\ /c $<
+{peg}.peg{peg}.c::
+	$(PACKCC) $<
+{peg}.c{peg}.obj::
+	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Fopeg\ /c $<
 
-all: ctags.exe readtags.exe
+all: $(PACKCC) ctags.exe readtags.exe
 
 ctags: ctags.exe
 
-ctags.exe: $(ALL_OBJS) $(ALL_HEADS) $(REGEX_HEADS) $(FNMATCH_HEADS) $(WIN32_HEADS) $(REPOINFO_HEADS)
+ctags.exe: $(ALL_OBJS) $(ALL_HEADS) $(PEG_HEADS) $(PEG_EXTRA_HEADS) $(REGEX_HEADS) $(FNMATCH_HEADS) $(WIN32_HEADS) $(REPOINFO_HEADS)
 	$(CC) $(OPT) /Fe$@ $(ALL_OBJS) /link setargv.obj $(LIBS) $(PDBFLAG)
 
 readtags.exe: $(READTAGS_OBJS) $(READTAGS_HEADS)
@@ -71,10 +80,18 @@ $(REGEX_OBJS): $(REGEX_SRCS)
 $(FNMATCH_OBJS): $(FNMATCH_SRCS)
 	$(CC) /c $(OPT) /Fo$@ $(INCLUDES) $(DEFINES) $(FNMATCH_SRCS)
 
+$(PACKCC_OBJS): $(PACKCC_SRCS)
+	$(CC) /c $(OPT) /Fo$@ $(INCLUDES) $(DEFINES) $(PACKCC_SRCS)
+
+$(PACKCC): $(PACKCC_OBJS) $(PACKCC_HEADS)
+	$(CC) $(OPT) /Fe$@ $(PACKCC_OBJS) /link setargv.obj $(PDBFLAG)
+
 main\repoinfo.obj: main\repoinfo.c main\repoinfo.h
 
+peg\varlink.c peg\varlink.h: peg\varlink.peg $(PACKCC)
+
 
 clean:
-	- del *.obj main\*.obj optlib\*.obj parsers\*.obj parsers\cxx\*.obj gnu_regex\*.obj fnmatch\*.obj read\*.obj win32\mkstemp\*.obj main\repoinfo.h
-	- del ctags.exe readtags.exe
+	- del *.obj main\*.obj optlib\*.obj parsers\*.obj parsers\cxx\*.obj gnu_regex\*.obj fnmatch\*.obj misc\packcc\*.obj peg\*.obj read\*.obj win32\mkstemp\*.obj main\repoinfo.h
+	- del ctags.exe readtags.exe $(PACKCC)
 	- del tags