mirror of https://github.com/stella-emu/stella.git
Fixed typo, and some formatting cleanup.
This commit is contained in:
parent
0b63649735
commit
672d501ab2
24
Makefile
24
Makefile
|
@ -40,24 +40,24 @@ include config.mak
|
||||||
# CXXFLAGS+= -Werror
|
# CXXFLAGS+= -Werror
|
||||||
|
|
||||||
ifdef CXXFLAGS
|
ifdef CXXFLAGS
|
||||||
CFLAGS:= $(CXXFLAGS)
|
CFLAGS:= $(CXXFLAGS)
|
||||||
CXXFLAGS:= $(CXXFLAGS) -x c++
|
CXXFLAGS:= $(CXXFLAGS) -x c++
|
||||||
else
|
else
|
||||||
CXXFLAGS:= -O2 -x c++
|
CXXFLAGS:= -O2 -x c++
|
||||||
CFLAGS:= -O2
|
CFLAGS:= -O2
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter
|
CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter
|
||||||
CXLAGS+= -Wall -Wextra -Wno-unused-parameter
|
CFLAGS+= -Wall -Wextra -Wno-unused-parameter
|
||||||
|
|
||||||
ifdef HAVE_GCC
|
ifdef HAVE_GCC
|
||||||
CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++17
|
CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++17
|
||||||
CFLAGS+= -Wno-multichar -Wunused
|
CFLAGS+= -Wno-multichar -Wunused
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef HAVE_CLANG
|
ifdef HAVE_CLANG
|
||||||
CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++17
|
CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++17
|
||||||
CFLAGS+= -Wno-multichar -Wunused
|
CFLAGS+= -Wno-multichar -Wunused
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef CLANG_WARNINGS
|
ifdef CLANG_WARNINGS
|
||||||
|
@ -67,34 +67,34 @@ ifdef CLANG_WARNINGS
|
||||||
-Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables \
|
-Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables \
|
||||||
-Wno-four-char-constants -Wno-padded
|
-Wno-four-char-constants -Wno-padded
|
||||||
|
|
||||||
CXXFLAGS+= $(EXTRA_WARN)
|
CXXFLAGS+= $(EXTRA_WARN)
|
||||||
CFLAGS+= $(EXTRA_WARN)
|
CFLAGS+= $(EXTRA_WARN)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef PROFILE
|
ifdef PROFILE
|
||||||
PROF:= -pg -fprofile-arcs -ftest-coverage
|
PROF:= -pg -fprofile-arcs -ftest-coverage
|
||||||
CXXFLAGS+= $(PROF)
|
CXXFLAGS+= $(PROF)
|
||||||
CFLAGS+= $(PROF)
|
CFLAGS+= $(PROF)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef DEBUG
|
ifdef DEBUG
|
||||||
CXXFLAGS += -g
|
CXXFLAGS += -g
|
||||||
CFLAGS += -g
|
CFLAGS += -g
|
||||||
else
|
else
|
||||||
ifdef HAVE_GCC
|
ifdef HAVE_GCC
|
||||||
CXXFLAGS+= -fomit-frame-pointer
|
CXXFLAGS+= -fomit-frame-pointer
|
||||||
CFLAGS+= -fomit-frame-pointer
|
CFLAGS+= -fomit-frame-pointer
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef HAVE_CLANG
|
ifdef HAVE_CLANG
|
||||||
CXXFLAGS+= -fomit-frame-pointer
|
CXXFLAGS+= -fomit-frame-pointer
|
||||||
CFLAGS+= -fomit-frame-pointer
|
CFLAGS+= -fomit-frame-pointer
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef RELEASE
|
ifdef RELEASE
|
||||||
CXXFLAGS += -flto -fno-rtti
|
CXXFLAGS += -flto -fno-rtti
|
||||||
CFLAGS += -flto
|
CFLAGS += -flto
|
||||||
LDFLAGS += -flto -fno-rtti
|
LDFLAGS += -flto -fno-rtti
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue