aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Augereau2008-05-15 10:34:43 +0000
committerBertrand Augereau2008-05-15 10:34:43 +0000
commit732d440d19a34f3f46c07487f5d724459375e640 (patch)
treeb68df6dada8b856f4ffaacf949e898f493470476
parentb619c6ce1904dd814781ca601e04a36d40a3cedd (diff)
downloadscummvm-rg350-732d440d19a34f3f46c07487f5d724459375e640.tar.gz
scummvm-rg350-732d440d19a34f3f46c07487f5d724459375e640.tar.bz2
scummvm-rg350-732d440d19a34f3f46c07487f5d724459375e640.zip
NDS: Rollback of the custom build target rule from .cpp.o to %.o: %.cpp
svn-id: r32137
-rw-r--r--backends/platform/ds/arm9/makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index ea98402d4e..787e15a03b 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -330,7 +330,8 @@ endef
ifndef HAVE_GCC3
# If you use GCC, disable the above and enable this for intelligent
# dependency tracking.
-.cpp.o:
+#.cpp.o:
+%.o: %.cpp
$(MKDIR) $(*D)/$(DEPDIR)
$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
@@ -342,7 +343,8 @@ else
# rule can get you into a bad state if you Ctrl-C at the wrong moment.
# Also, with this GCC inserts additional dummy rules for the involved headers,
# which ensures a smooth compilation even if said headers become obsolete.
-.cpp.o:
+#.cpp.o:
+%.o: %.cpp
# echo !!!!!!!!!!!! $(notdir $<)
# ifeq ( $(notdir $<), $(findstring $(notdir $<), $(OPTLIST)) )
# OPTFLAG=-O3