From 005ebde8cebb6d8b5306a02f6cfaf754d84b3173 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Fri, 3 Jun 2016 04:50:55 +0000
Subject: [PATCH] Makefile: Make Objective-C code build as Objective-C++ when
 we build C code as C++.

git-svn-id: https://svn.eduke32.com/eduke32@5764 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile.common | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index ff87c93a7..9f47ed195 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -36,7 +36,8 @@ ifeq ($(AS),as)
     override AS=nasm
 endif
 
-COBJC=$(CC)
+COBJC=$(CC) -x objective-c
+COBJCXX=$(CXX) -x objective-c++
 L_CC=$(CC)
 L_CXX=$(CXX)
 
@@ -74,6 +75,7 @@ ifneq (0,$(CLANG))
     override CC=clang -x c
     override CXX=clang -x c++
     override COBJC=clang -x objective-c
+    override COBJCXX=clang -x objective-c++
     override L_CC=clang
     override L_CXX=clang
 endif
@@ -1076,6 +1078,7 @@ COMPILER_OBJC=$(COBJC) $(CONLYFLAGS)
 LINKER=$(L_CC) $(CONLYFLAGS)
 ifneq ($(CPLUSPLUS),0)
     COMPILER=$(CXX) $(CXXONLYFLAGS)
+    COMPILER_OBJC=$(COBJCXX) $(CXXONLYFLAGS)
     LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS)
 endif