diff options
author | Twinaphex | 2017-06-18 18:41:06 +0200 |
---|---|---|
committer | GitHub | 2017-06-18 18:41:06 +0200 |
commit | 1aecedc999445e9a27e04f665fd562b576775d08 (patch) | |
tree | c526c7d332be548a42364eea9113b6d33345b840 /Makefile.common | |
parent | dc596c886e0ec2728dc353dd7862cdf1e5a5ff44 (diff) | |
parent | bcaf44c511efaad9d803dde9b0fdbb046498c66f (diff) | |
download | snes9x2005-1aecedc999445e9a27e04f665fd562b576775d08.tar.gz snes9x2005-1aecedc999445e9a27e04f665fd562b576775d08.tar.bz2 snes9x2005-1aecedc999445e9a27e04f665fd562b576775d08.zip |
Merge pull request #36 from jamsilva/master
Compatibility fixes.
Diffstat (limited to 'Makefile.common')
-rw-r--r-- | Makefile.common | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/Makefile.common b/Makefile.common index 7159234..83a0fdc 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2,9 +2,10 @@ INCFLAGS := -I$(CORE_DIR) -I$(LIBRETRO_DIR) ifeq ($(HAVE_GRIFFIN), 1) SOURCES_C := $(CORE_DIR)/catsfc_griffin.c -SOURCES_C += $(CORE_DIR)/sa1.c \ - $(CORE_DIR)/sa1cpu.c \ - $(CORE_DIR)/apu_blargg.c +SOURCES_C += \ + $(CORE_DIR)/sa1.c \ + $(CORE_DIR)/sa1cpu.c \ + $(CORE_DIR)/apu_blargg.c else SOURCES_C := \ $(CORE_DIR)/apu.c \ @@ -39,48 +40,42 @@ SOURCES_C := \ $(CORE_DIR)/spc7110.c \ $(CORE_DIR)/srtc.c \ $(CORE_DIR)/tile.c \ - $(CORE_DIR)/apu_blargg.c - -SOURCES_C += $(LIBRETRO_DIR)/libretro.c + $(CORE_DIR)/apu_blargg.c \ + $(LIBRETRO_DIR)/libretro.c endif ifeq ($(DEBUG),1) -FLAGS += -O0 -g + FLAGS += -O0 -g else -FLAGS += -O3 -DNDEBUG + FLAGS += -O3 -DNDEBUG endif ifeq ($(PERF_TEST),1) -FLAGS += -DPERF_TEST + FLAGS += -DPERF_TEST endif ifeq ($(USE_BLARGG_APU),1) -FLAGS += -DUSE_BLARGG_APU + FLAGS += -DUSE_BLARGG_APU endif ifeq ($(LOAD_FROM_MEMORY_TEST),1) -FLAGS += -DLOAD_FROM_MEMORY_TEST + FLAGS += -DLOAD_FROM_MEMORY_TEST endif -DEFS += -DSPC700_C -DEXECUTE_SUPERFX_PER_LINE -DSDD1_DECOMP \ - -DVAR_CYCLES -DCPU_SHUTDOWN -DSPC700_SHUTDOWN \ - -DNO_INLINE_SET_GET -DHAVE_MKSTEMP -DWANT_CHEATS - -DEFS += -D__LIBRETRO__ - ifeq ($(OLD_GCC), 1) -WARNINGS := -Wall + WARNINGS := -Wall else ifeq ($(NO_GCC), 1) -WARNINGS := + WARNINGS := else -WARNINGS := -Wall \ - -Wno-sign-compare \ - -Wno-unused-variable \ - -Wno-unused-function \ - -Wno-uninitialized \ - -Wno-strict-aliasing \ - -Wno-overflow \ - -fno-strict-overflow + WARNINGS := \ + -Wall \ + -Wno-sign-compare \ + -Wno-unused-variable \ + -Wno-unused-function \ + -Wno-uninitialized \ + -Wno-strict-aliasing \ + -Wno-overflow \ + -fno-strict-overflow endif FLAGS += $(DEFS) $(WARNINGS) $(INCFLAGS) |