From 5ebab4089a86fa01ee6d1099db35849f32f63d64 Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Mon, 5 Feb 2007 21:16:56 +0000
Subject: (svn r8605) -Codechange: [OSX] changed all objective C to objective
 C++    This will permanently solve the issue where compilation on OSX broke
 because C++ code was added to some header files

   -Note: (important if you develop mac specific code)
   taken from http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html
    gdb lacks an integrated C++ with Objective-C parser. This means that gdb won't be able to evaluate expressions that contain both C++ and Objective-C constructs.
    gdb assumes that the language for ".mm" files is C++.
    you can change it to objective C by typing: (gdb) set language objc
    Mixing C++ and objective C has some limitation (see link for all of them)
---
 Makefile.src.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Makefile.src.in')

diff --git a/Makefile.src.in b/Makefile.src.in
index 06d6f43b7..8c9e4a8f8 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -35,9 +35,9 @@ CONFIG_CACHE_VERSION  = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_VERSION!!
 
 OBJS_C   := !!OBJS_C!!
 OBJS_CPP := !!OBJS_CPP!!
-OBJS_M   := !!OBJS_M!!
+OBJS_MM  := !!OBJS_MM!!
 OBJS_RC  := !!OBJS_RC!!
-OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_M) $(OBJS_RC)
+OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_MM) $(OBJS_RC)
 SRCS     := !!SRCS!!
 
 # All C-files depend on those 3 files
@@ -126,12 +126,12 @@ $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
 
-$(OBJS_M:%.o=%.d): %.d: $(SRC_DIR)/%.m $(FILE_DEP)
-	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.m=%.m)'
-	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
+$(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
+	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
+	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
 
 $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)
-	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.m=%.m)'
+	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)touch $@
 
 else
@@ -211,9 +211,9 @@ $(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
 
-$(OBJS_M): %.o: $(SRC_DIR)/%.m $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.m=%.m)'
-	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
+$(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
+	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
 
 $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)'
-- 
cgit v1.2.3-54-g00ecf