mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Ensure that Objective-C compiler invocations include the C-only options that we specify, especially -std=gnu99. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5168 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
4bf493c76b
commit
67cc5911fa
1 changed files with 3 additions and 2 deletions
|
@ -36,7 +36,7 @@ ifeq ($(AS),as)
|
||||||
override AS=nasm
|
override AS=nasm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
COMPILER_OBJC=$(CC)
|
COBJC=$(CC)
|
||||||
L_CC=$(CC)
|
L_CC=$(CC)
|
||||||
L_CXX=$(CXX)
|
L_CXX=$(CXX)
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ endif
|
||||||
ifneq (0,$(CLANG))
|
ifneq (0,$(CLANG))
|
||||||
override CC=clang -x c
|
override CC=clang -x c
|
||||||
override CXX=clang -x c++
|
override CXX=clang -x c++
|
||||||
override COMPILER_OBJC=clang -x objective-c
|
override COBJC=clang -x objective-c
|
||||||
override L_CC=clang
|
override L_CC=clang
|
||||||
override L_CXX=clang
|
override L_CXX=clang
|
||||||
endif
|
endif
|
||||||
|
@ -1060,6 +1060,7 @@ ifneq (,$(VC_REV)$(VC_REV_CUSTOM))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
COMPILER=$(CC) $(CONLYFLAGS)
|
COMPILER=$(CC) $(CONLYFLAGS)
|
||||||
|
COMPILER_OBJC=$(COBJC) $(CONLYFLAGS)
|
||||||
LINKER=$(L_CC)
|
LINKER=$(L_CC)
|
||||||
ifneq ($(CPLUSPLUS),0)
|
ifneq ($(CPLUSPLUS),0)
|
||||||
COMPILER=$(CXX) $(CPPONLYFLAGS)
|
COMPILER=$(CXX) $(CPPONLYFLAGS)
|
||||||
|
|
Loading…
Reference in a new issue