ShuriZma
/
bsnes
mirror of https://github.com/bsnes-emu/bsnes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from orbea/cxxflags 

libretro: Change CXXFLAGS to CFLAGS.
This commit is contained in:
Twinaphex 2017-12-22 08:02:36 +01:00 committed by GitHub
parent 2a69081e53 2184fd0902
commit 1d96a10acb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretro/Makefile
View File

@ -53,7 +53,7 @@ endif
ifeq ($(platform), osx) ifeq ($(platform), osx)
ifndef ($(NOUNIVERSAL)) ifndef ($(NOUNIVERSAL))
CXXFLAGS += $(ARCHFLAGS) CFLAGS += $(ARCHFLAGS)
LFLAGS += $(ARCHFLAGS) LFLAGS += $(ARCHFLAGS)
endif endif
endif endif
@ -93,10 +93,10 @@ else
endif endif
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64)) ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
CC += -miphoneos-version-min=8.0 CC += -miphoneos-version-min=8.0
CXXFLAGS += -miphoneos-version-min=8.0 CFLAGS += -miphoneos-version-min=8.0
else else
CC += -miphoneos-version-min=5.0 CC += -miphoneos-version-min=5.0
CXXFLAGS += -miphoneos-version-min=5.0 CFLAGS += -miphoneos-version-min=5.0
endif endif
else ifneq (,$(findstring qnx,$(platform))) else ifneq (,$(findstring qnx,$(platform)))
TARGET := $(TARGET_NAME)_libretro_qnx.so TARGET := $(TARGET_NAME)_libretro_qnx.so
@ -126,9 +126,9 @@ MKDIR := $(shell which mkdir)
LDFLAGS += $(LIBM) LDFLAGS += $(LIBM)
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CXXFLAGS += -O0 -g CFLAGS += -O0 -g
else else
CXXFLAGS += -O2 -DNDEBUG CFLAGS += -O2 -DNDEBUG
endif endif
include Makefile.common include Makefile.common
@ -136,7 +136,6 @@ include Makefile.common
OBJECTS := $(patsubst %.c,$(CORE_DIR)/build/obj/%_libretro.c.o,$(SOURCES_C)) OBJECTS := $(patsubst %.c,$(CORE_DIR)/build/obj/%_libretro.c.o,$(SOURCES_C))
CFLAGS += -Wall -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_MATH_DEFINES CFLAGS += -Wall -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_MATH_DEFINES
CXXFLAGS += -Wall -D__LIBRETRO__ $(fpic)
all: $(TARGET) all: $(TARGET)