zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile: Make Objective-C code build as Objective-C++ when we build C code as C++.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5764 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-06-03 04:50:55 +00:00
parent ca619df429
commit 005ebde8ce
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/Makefile.common
View file

@ -36,7 +36,8 @@ ifeq ($(AS),as)
override AS=nasm override AS=nasm
endif endif
COBJC=$(CC) COBJC=$(CC) -x objective-c
COBJCXX=$(CXX) -x objective-c++
L_CC=$(CC) L_CC=$(CC)
L_CXX=$(CXX) L_CXX=$(CXX)
@ -74,6 +75,7 @@ ifneq (0,$(CLANG))
override CC=clang -x c override CC=clang -x c
override CXX=clang -x c++ override CXX=clang -x c++
override COBJC=clang -x objective-c override COBJC=clang -x objective-c
override COBJCXX=clang -x objective-c++
override L_CC=clang override L_CC=clang
override L_CXX=clang override L_CXX=clang
endif endif
@ -1076,6 +1078,7 @@ COMPILER_OBJC=$(COBJC) $(CONLYFLAGS)
LINKER=$(L_CC) $(CONLYFLAGS) LINKER=$(L_CC) $(CONLYFLAGS)
ifneq ($(CPLUSPLUS),0) ifneq ($(CPLUSPLUS),0)
COMPILER=$(CXX) $(CXXONLYFLAGS) COMPILER=$(CXX) $(CXXONLYFLAGS)
COMPILER_OBJC=$(COBJCXX) $(CXXONLYFLAGS)
LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS)
endif endif