diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile --- a/higan/GNUmakefile 2017-08-11 06:03:07.000000000 -0400 +++ b/higan/GNUmakefile 2017-09-21 15:45:07.561964734 -0400 @@ -19,7 +19,7 @@ else ifeq ($(platform),macosx) flags += -march=native else ifneq ($(filter $(platform),linux bsd),) - flags += -march=native -fopenmp + flags += -fopenmp link += -fopenmp link += -Wl,-export-dynamic link += -lX11 -lXext @@ -30,9 +30,9 @@ compile = \ $(strip \ $(if $(filter %.c,$<), \ - $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \ + $(compiler) $(cflags) $(flags) $(CFLAGS) $1 -c $< -o $@, \ $(if $(filter %.cpp,$<), \ - $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \ + $(compiler) $(cppflags) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \ ) \ ) \ ) diff -Naur a/higan/target-tomoko/GNUmakefile b/higan/target-tomoko/GNUmakefile --- a/higan/target-tomoko/GNUmakefile 2017-07-28 03:41:22.000000000 -0400 +++ b/higan/target-tomoko/GNUmakefile 2017-09-21 15:46:18.861960790 -0400 @@ -48,10 +48,10 @@ objects := $(patsubst %,obj/%.o,$(objects)) obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/) - $(compiler) $(rubyflags) -c $< -o $@ + $(compiler) $(rubyflags) $(CXXFLAGS) -c $< -o $@ obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/) - $(compiler) $(hiroflags) -c $< -o $@ + $(compiler) $(hiroflags) $(CXXFLAGS) -c $< -o $@ obj/ui-tomoko.o: $(ui)/tomoko.cpp $(call rwildcard,$(ui)/) obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/) @@ -67,7 +67,7 @@ # targets build: $(objects) - $(strip $(compiler) -o out/$(name) $(objects) $(link)) + $(strip $(CXX) $(CXXFLAGS) -o out/$(name) $(objects) $(link)) ifeq ($(platform),macosx) @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi mkdir -p out/$(name).app/Contents/MacOS/ diff -Naur a/icarus/GNUmakefile b/icarus/GNUmakefile --- a/icarus/GNUmakefile 2017-07-30 03:32:34.000000000 -0400 +++ b/icarus/GNUmakefile 2017-09-21 15:48:41.750952887 -0400 @@ -3,7 +3,7 @@ include ../hiro/GNUmakefile name := icarus -flags += -I.. +flags += -I.. $(CXXFLAGS) link += ifeq ($(platform),windows) @@ -15,7 +15,7 @@ objects += $(if $(call streq,$(platform),windows),obj/resource.o) all: $(objects) - $(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink)) + $(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS)) ifeq ($(platform),macosx) @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi mkdir -p out/$(name).app/Contents/MacOS/