Skip to content

Commit

Permalink
[ci skip] correct slip in new dependency generartion in the msvc make…
Browse files Browse the repository at this point in the history
…files.
  • Loading branch information
eliotmiranda committed Sep 22, 2021
1 parent 61e6b0e commit 6b4a73c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 1 addition & 8 deletions building/win64x64/common/Makefile.msvc.clang.rules
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,24 @@ $(info OBJDIR is $(OBJDIR))
# Rules for automated builds
#

# We delete any and all system include files. If the system changes, rebuild.
# We're only interested in rebuilding correctly when our code changes.
# Hence generate the dep files to a temporary .Td file and edit to a .d file.
DEPFLAGS = -MP -MF deps/$(*F).Td
DEPFLAGS = -MP -MF deps/$(*F).d
ALLFLAGS = $(DEPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFS)
POSTCOMPILE = tr \\015 \\012 <deps/$(*F).Td | egrep -v 'Community|Windows\\ Kits' | sed -e '/^[A-Z]:.*:$$/d' -e 's/ [^ ]*:/:/' -e 's/^build[^/]*/$$(BUILD)/' | grep '[/\\\\]' | sed "s|\\\\[^ (]|/|g" > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d

.c.o:
$(CC) -o $(OBJDIR)/$@ $(ALLFLAGS) -c $<

$(OBJDIR)/%.o: %.c
$(CC) -o $@ $(ALLFLAGS) -c $<
$(POSTCOMPILE)

.cpp.o:
$(CC) -o $(OBJDIR)/$@ -fcxx-exceptions $(ALLFLAGS) -c $<
$(POSTCOMPILE)

# This is causing the plugin directory to be repeated in the -F
#$(OBJDIR)/%.o: %.cpp
# $(CC) -o $(OBJDIR)/$@ $(ALLFLAGS) -c $<

$(OBJDIR)/%.o: %.cpp
$(CC) -o $@ $(ALLFLAGS) -c $<
$(POSTCOMPILE)

.rc.res:
$(RC) $(RCFLAGS) /fo $@ $<
Expand Down
2 changes: 1 addition & 1 deletion building/win64x64/common/Makefile.msvc.rules
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

$(info OBJDIR is $(OBJDIR))

DEPFLAGS = -MF deps/$(*F).Td
DEPFLAGS = -MF deps/$(*F).d
ALLCFLAGS = $(DEPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFS)
ALLCXXFLAGS = $(DEPFLAGS) $(CXXFLAGS) $(INCLUDES) $(DEFS)

Expand Down

0 comments on commit 6b4a73c

Please sign in to comment.