aboutsummaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorOystein Eftevaag2009-12-26 13:35:57 +0000
committerOystein Eftevaag2009-12-26 13:35:57 +0000
commit9d70103d9c84c0dc993faafddcf3fd00b02241ea (patch)
treeecf9dc805223dcf718784a8da86b7f3ebb5466dd /Makefile.common
parent21c6bbc588a981cf8facd63432845a2c81e73e48 (diff)
downloadscummvm-rg350-9d70103d9c84c0dc993faafddcf3fd00b02241ea.tar.gz
scummvm-rg350-9d70103d9c84c0dc993faafddcf3fd00b02241ea.tar.bz2
scummvm-rg350-9d70103d9c84c0dc993faafddcf3fd00b02241ea.zip
The file selection dialog in OS X now uses Cocoa instead of Carbon, and lives in a separate file due to having to be compiled as Objective-C++. ScummVM can now run in x64 natively on OS X
svn-id: r46581
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common
index 74fc84356d..083d86d4cb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -102,7 +102,12 @@ ifdef CXX_UPDATE_DEP_FLAG
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-# Build rule for Objective-C files. Strictly speaking, this is for OS X only.
+
+# Build rules for Objective-C and Objective-C++ files. Strictly speaking, this is for OS X only.
+%.o: %.mm
+ $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
+ $(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+
%.o: %.m
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(OBJCFLAGS) -c $(<) -o $*.o