diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | Makefile.common | 29 | ||||
| -rw-r--r-- | backends/dc/.cvsignore | 6 | ||||
| -rw-r--r-- | backends/morphos/.cvsignore | 1 | ||||
| -rw-r--r-- | backends/sdl/.cvsignore | 1 | ||||
| -rw-r--r-- | backends/wince/.cvsignore | 1 | ||||
| -rw-r--r-- | backends/x11/.cvsignore | 1 | ||||
| -rw-r--r-- | common/.cvsignore | 1 | ||||
| -rw-r--r-- | gui/.cvsignore | 1 | ||||
| -rw-r--r-- | scumm/.cvsignore | 1 | ||||
| -rw-r--r-- | simon/.cvsignore | 1 | ||||
| -rw-r--r-- | sound/.cvsignore | 1 |
12 files changed, 29 insertions, 17 deletions
diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000000..4e0ae0f23c --- /dev/null +++ b/.cvsignore @@ -0,0 +1,2 @@ +.deps +scummvm diff --git a/Makefile.common b/Makefile.common index 29ec920146..69258f2f98 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2,6 +2,9 @@ # This file is used by Makefile, Makefile.irix, Makefile.macosx and declares # common rules, a list of common object files etc. +# List of all sub modules +MODULES := common gui scumm simon sound + ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip INCS = scumm/scumm.h common/scummsys.h common/stdafx.h @@ -49,19 +52,21 @@ clean: .PHONY: all clean dist # Default (dumb) compile & dependcy rules -.cpp.o: - $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o -$(OBJS): $(INCS) +#.cpp.o: +# $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o +#$(OBJS): $(INCS) # If you use GCC, disable the above and enable this for intelligent # dependency tracking. -#DEPDIR := .deps -#.cpp.o: -# mkdir -p $(*D)/$(DEPDIR) -# $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o -# echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d -# cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d" -# rm -f "$(*D)/$(DEPDIR)/$(*F).d2" -# -#-include $(DEPDIR)/*.d +DEPDIR := .deps +DEPDIRS = $(patsubst %,%/$(DEPDIR),$(MODULES)) +DEPFILES = $(wildcard $(DEPDIRS)/*.d) /dev/null +.cpp.o: + mkdir -p $(*D)/$(DEPDIR) + $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o + echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d + cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d" + rm -f "$(*D)/$(DEPDIR)/$(*F).d2" + +-include $(DEPDIR)/*.d diff --git a/backends/dc/.cvsignore b/backends/dc/.cvsignore index ed6bd2b99e..39a06683b7 100644 --- a/backends/dc/.cvsignore +++ b/backends/dc/.cvsignore @@ -1,5 +1 @@ -scummvm -sound -v3 -v4 -simon +.deps diff --git a/backends/morphos/.cvsignore b/backends/morphos/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/backends/morphos/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/backends/sdl/.cvsignore b/backends/sdl/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/backends/sdl/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/backends/wince/.cvsignore b/backends/wince/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/backends/wince/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/backends/x11/.cvsignore b/backends/x11/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/backends/x11/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/common/.cvsignore b/common/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/common/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/gui/.cvsignore b/gui/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/gui/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/scumm/.cvsignore b/scumm/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/scumm/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/simon/.cvsignore b/simon/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/simon/.cvsignore @@ -0,0 +1 @@ +.deps diff --git a/sound/.cvsignore b/sound/.cvsignore new file mode 100644 index 0000000000..39a06683b7 --- /dev/null +++ b/sound/.cvsignore @@ -0,0 +1 @@ +.deps |