steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GNUmakefile: add -std=c++11 to CXXFLAGS

db4
Doug Coleman 2015-06-05 10:31:49 -07:00
parent a83df49ecc
commit ad2c2c36bb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GNUmakefile
View File

@ -11,6 +11,8 @@ ifdef CONFIG
-DFACTOR_GIT_LABEL="$(GIT_LABEL)" \ -DFACTOR_GIT_LABEL="$(GIT_LABEL)" \
$(SITE_CFLAGS) $(SITE_CFLAGS)
CXXFLAGS += -std=c++11
ifdef DEBUG ifdef DEBUG
CFLAGS += -g -DFACTOR_DEBUG CFLAGS += -g -DFACTOR_DEBUG
else else
@ -207,11 +209,11 @@ factor-lib: $(ENGINE)
factor: $(EXE_OBJS) $(DLL_OBJS) factor: $(EXE_OBJS) $(DLL_OBJS)
$(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \ $(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \
$(CFLAGS) -o $(EXECUTABLE) $(LIBS) $(EXE_OBJS) $(CFLAGS) $(CXXFLAGS) -o $(EXECUTABLE) $(LIBS) $(EXE_OBJS)
factor-console: $(EXE_OBJS) $(DLL_OBJS) factor-console: $(EXE_OBJS) $(DLL_OBJS)
$(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \ $(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \
$(CFLAGS) $(CFLAGS_CONSOLE) -o $(CONSOLE_EXECUTABLE) $(LIBS) $(EXE_OBJS) $(CFLAGS) $(CXXFLAGS) $(CFLAGS_CONSOLE) -o $(CONSOLE_EXECUTABLE) $(LIBS) $(EXE_OBJS)
factor-ffi-test: $(FFI_TEST_LIBRARY) factor-ffi-test: $(FFI_TEST_LIBRARY)
@ -225,16 +227,16 @@ vm/ffi_test.o: vm/ffi_test.c
$(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) $(FFI_TEST_CFLAGS) -o $@ $< $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) $(FFI_TEST_CFLAGS) -o $@ $<
vm/master.hpp.gch: vm/master.hpp $(MASTER_HEADERS) vm/master.hpp.gch: vm/master.hpp $(MASTER_HEADERS)
$(TOOLCHAIN_PREFIX)$(CXX) -c -x c++-header $(CFLAGS) -o $@ $< $(TOOLCHAIN_PREFIX)$(CXX) -c -x c++-header $(CFLAGS) $(CXXFLAGS) -o $@ $<
%.o: %.cpp vm/master.hpp.gch %.o: %.cpp vm/master.hpp.gch
$(TOOLCHAIN_PREFIX)$(CXX) -c $(CFLAGS) -o $@ $< $(TOOLCHAIN_PREFIX)$(CXX) -c $(CFLAGS) $(CXXFLAGS) -o $@ $<
%.o: %.S %.o: %.S
$(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) -o $@ $< $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) $(CXXFLAGS) -o $@ $<
%.o: %.mm vm/master.hpp.gch %.o: %.mm vm/master.hpp.gch
$(TOOLCHAIN_PREFIX)$(CXX) -c $(CFLAGS) -o $@ $< $(TOOLCHAIN_PREFIX)$(CXX) -c $(CFLAGS) $(CXXFLAGS) -o $@ $<
.SUFFIXES: .mm .SUFFIXES: .mm