Skip to content

Commit

Permalink
buildsys,mvc,mingw: Refine the makefiles
Browse files Browse the repository at this point in the history
* `PACKCC_HEADS` is not used. Remove it.
* Change the mk_mvc.mak structure based on mk_mingw.mak.
* Define HAVE_STDBOOL_H.
  • Loading branch information
k-takata committed Jul 19, 2019
1 parent 206c43f commit 8ed0c0b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion mk_mingw.mak
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

include source.mak

REGEX_DEFINES = -DHAVE_REGCOMP -D__USE_GNU -Dbool=int -Dfalse=0 -Dtrue=1 -Dstrcasecmp=stricmp
REGEX_DEFINES = -DHAVE_REGCOMP -D__USE_GNU -DHAVE_STDBOOL_H -Dstrcasecmp=stricmp

CFLAGS = -Wall -std=gnu99
# sizeof (size_t) == sizeof(unsigned long) == 4 on i686-w64-mingw32-gcc.
Expand Down
13 changes: 8 additions & 5 deletions mk_mvc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@

include source.mak

REGEX_DEFINES = -DHAVE_REGCOMP -D__USE_GNU -DHAVE_STDBOOL_H -Dstrcasecmp=stricmp

OBJEXT = obj
DEFINES = -DWIN32 -DHAVE_REGCOMP -D__USE_GNU -Dstrcasecmp=stricmp -DHAVE_PACKCC -DHAVE_REPOINFO_H -DSIZE_T_FMT_CHAR=\"I\"
REGEX_DEFINES = -Dbool=int -Dfalse=0 -Dtrue=1 $(DEFINES)
SIZE_T_FMT_CHAR=\"I\"
COMMON_DEFINES =
DEFINES = -DWIN32 $(REGEX_DEFINES) -DHAVE_PACKCC $(COMMON_DEFINES) -DHAVE_REPOINFO_H
INCLUDES = -I. -Imain -Ignu_regex -Ifnmatch -Iparsers
OPT = /O2 /WX
PACKCC = packcc.exe
Expand Down Expand Up @@ -75,15 +78,15 @@ readtags.exe: $(READTAGS_OBJS) $(READTAGS_HEADS)
$(CC) $(OPT) /Fe$@ $(READTAGS_OBJS) /link setargv.obj $(PDBFLAG)

$(REGEX_OBJS): $(REGEX_SRCS)
$(CC) /c $(OPT) /Fo$@ $(INCLUDES) $(REGEX_DEFINES) $(REGEX_SRCS)
$(CC) /c $(OPT) /Fo$@ $(INCLUDES) $(DEFINES) $(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)
$(CC) /c $(OPT) /Fo$@ $(INCLUDES) $(COMMON_DEFINES) -DSIZE_T_FMT_CHAR=$(SIZE_T_FMT_CHAR) $(PACKCC_SRCS)

$(PACKCC): $(PACKCC_OBJS) $(PACKCC_HEADS)
$(PACKCC): $(PACKCC_OBJS)
$(CC) $(OPT) /Fe$@ $(PACKCC_OBJS) /link setargv.obj $(PDBFLAG)

main\repoinfo.obj: main\repoinfo.c main\repoinfo.h
Expand Down

0 comments on commit 8ed0c0b

Please sign in to comment.