[Scummvm-cvs-logs] SF.net SVN: scummvm:[45984] scummvm/branches/branch-1-0-0/Makefile.common
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Nov 19 00:36:12 CET 2009
Revision: 45984
http://scummvm.svn.sourceforge.net/scummvm/?rev=45984&view=rev
Author: fingolfin
Date: 2009-11-18 23:36:12 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
Backport Makefile.common tweaks
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/Makefile.common
Modified: scummvm/branches/branch-1-0-0/Makefile.common
===================================================================
--- scummvm/branches/branch-1-0-0/Makefile.common 2009-11-18 23:35:50 UTC (rev 45983)
+++ scummvm/branches/branch-1-0-0/Makefile.common 2009-11-18 23:36:12 UTC (rev 45984)
@@ -96,16 +96,20 @@
%.o: %.cpp
$(MKDIR) $(*D)/$(DEPDIR)
$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+
+# Build rule for Objective-C files. Strictly speaking, this is for OS X only.
%.o: %.m
$(MKDIR) $(*D)/$(DEPDIR)
$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) -c $(<) -o $*.o
endif
+# Build rule for assembler files
%.o: %.s
$(MKDIR) $(*D)
$(AS) $(ASFLAGS) $(<) -o $*.o
ifdef HAVE_NASM
+# Build rule for NASM assembler files
%.o: %.asm
$(MKDIR) $(*D)
$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list