diff options
| author | Michael Lutz <michi@icosahedron.de> | 2019-04-01 00:55:37 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2019-04-06 11:27:39 +0200 |
| commit | 3b86f54fc739510277f434c68e17a93ab6448ed4 (patch) | |
| tree | 3ed14798de5b8db8a5f37c516ce0bc0a55aedc1e | |
| parent | 90a91f1d0daf4e043d3ee3212eb77c19c7247e1d (diff) | |
| download | openttd-3b86f54fc739510277f434c68e17a93ab6448ed4.tar.xz | |
Fix: [OSX] .mm files are C++ files, not C files.
| -rw-r--r-- | Makefile.src.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index a64a5d5df..3a4db6c17 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -139,7 +139,7 @@ $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP) $(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):@' > $@ + $(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@ $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP) $(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.rc=%.rc)' @@ -249,7 +249,7 @@ $(filter %sse4.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP) $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP) $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)' - $(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $< + $(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $< $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP) $(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)' |