Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-28 07:04:35 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Allow JSMESS to compile with -Werror (nw)

Browse Source
This commit is contained in:
Justin Kerk 2014-03-12 16:22:04 +00:00
parent 35c14d7114
commit 446ac03dd9
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/build/cc_detection.mak
View File

@ -1,15 +1,16 @@
ifneq ($(TARGETOS),emscripten)
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
include $(SRC)/build/flags_clang.mak include $(SRC)/build/flags_clang.mak
else else
TEST_GCC = $(shell gcc --version) ifneq (,$(findstring emcc,$(CC)))
# is it Clang symlinked/renamed to GCC (Xcode 5.0 on OS X)? # Emscripten compiler is based on clang
ifeq ($(findstring clang,$(TEST_GCC)),clang)
include $(SRC)/build/flags_clang.mak include $(SRC)/build/flags_clang.mak
else else
include $(SRC)/build/flags_gcc.mak TEST_GCC = $(shell gcc --version)
# is it Clang symlinked/renamed to GCC (Xcode 5.0 on OS X)?
ifeq ($(findstring clang,$(TEST_GCC)),clang)
include $(SRC)/build/flags_clang.mak
else
include $(SRC)/build/flags_gcc.mak
endif
endif endif
endif endif
endif

6
src/build/flags_clang.mak
View File

@ -11,4 +11,8 @@ TEST_CLANG := $(shell clang --version)
ifeq ($(findstring 3.4,$(TEST_CLANG)),3.4) ifeq ($(findstring 3.4,$(TEST_CLANG)),3.4)
CCOMFLAGS += -Wno-inline-new-delete CCOMFLAGS += -Wno-inline-new-delete
endif endif
ifeq ($(TARGETOS),emscripten)
CCOMFLAGS += -Qunused-arguments
endif

2
src/lib/lib.mak
View File

@ -356,8 +356,10 @@ else
FLACOPTS += -DVERSION=\"1.2.1\" FLACOPTS += -DVERSION=\"1.2.1\"
endif endif
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
ifneq (,$(findstring emcc,$(CC)))
FLACOPTS += -Wno-unused-const-variable FLACOPTS += -Wno-unused-const-variable
endif endif
endif
LIBFLACOBJS = \ LIBFLACOBJS = \
$(LIBOBJ)/libflac/bitmath.o \ $(LIBOBJ)/libflac/bitmath.o \