Mercurial > hg > match-vamp
changeset 194:dce369bbbda6 re-minimise
Use compact types everywhere by default
| author | Chris Cannam |
|---|---|
| date | Thu, 26 Feb 2015 15:57:50 +0000 |
| parents | 3156f197b6c2 |
| children | d5c764463b97 |
| files | Makefile.inc Makefile.linux Makefile.osx |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.inc Thu Feb 26 15:57:32 2015 +0000 +++ b/Makefile.inc Thu Feb 26 15:57:50 2015 +0000 @@ -4,7 +4,7 @@ CXX ?= g++ CC ?= gcc -CXXFLAGS := -Isrc $(CXXFLAGS) +CXXFLAGS := -Isrc -DUSE_COMPACT_TYPES $(CXXFLAGS) TEST_LDFLAGS += -lboost_unit_test_framework
--- a/Makefile.linux Thu Feb 26 15:57:32 2015 +0000 +++ b/Makefile.linux Thu Feb 26 15:57:50 2015 +0000 @@ -1,7 +1,7 @@ -CXXFLAGS += -fPIC -ffast-math -O3 -Wall -Werror -Werror=old-style-cast -Wconversion -std=c++11 -DUSE_COMPACT_TYPES -DPERFORM_ERROR_CHECKS=1 +CXXFLAGS += -fPIC -ffast-math -O3 -Wall -Werror -Werror=old-style-cast -Wconversion -std=c++11 -DPERFORM_ERROR_CHECKS=1 -#CXXFLAGS += -fPIC -g -Wall -Werror -Wconversion -DPERFORM_ERROR_CHECKS=1 -std=c++11 +#CXXFLAGS += -fPIC -g -Wall -Werror -Werror=old-style-cast -Wconversion -DPERFORM_ERROR_CHECKS=1 -std=c++11 LDFLAGS += -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic PLUGIN_LDFLAGS += -shared -Wl,-Bsymbolic -Wl,-z,defs -lpthread -Wl,--version-script=vamp-plugin.map
--- a/Makefile.osx Thu Feb 26 15:57:32 2015 +0000 +++ b/Makefile.osx Thu Feb 26 15:57:50 2015 +0000 @@ -1,5 +1,6 @@ + ARCHFLAGS := -arch x86_64 -mmacosx-version-min=10.7 -CFLAGS := $(ARCHFLAGS) -O3 -I../vamp-plugin-sdk -I/usr/local/boost -Wall -fPIC +CFLAGS := $(ARCHFLAGS) -O3 -I../vamp-plugin-sdk -I/usr/local/boost -Wall -fPIC -std=c++11 CXXFLAGS := $(CFLAGS) LDFLAGS := -L../vamp-plugin-sdk -lvamp-sdk $(ARCHFLAGS)