mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

debug a crash for travis

Browse Source
This commit is contained in:
Jinhao 2016-06-24 11:48:15 +08:00
parent 2f86b26075
commit 5ba6d52774
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
build/makefile/makefile
View File

@ -1,43 +1,53 @@
#Nana C++ Library #Nana C++ Library
# #
#Makefile created by Jinhao(cnjinhao@hotmail.com) #Makefile created by sarrow104(sarrow104@gmail.com)
GCC = g++ GCC = g++
INCROOT = ../../include INCROOT = ../../include
SRCROOT = ../../source SRCROOT = ../../source
EXTRLIB = ../../extrlib EXTRLIB = ../../extrlib
NANA_INC= $(INCROOT)/nana NANA_INC= $(INCROOT)/nana
OUTROOT = out
#CXXFLAGS= -g -std=c++11 -Wall
CXXFLAGS= -g -fexceptions -std=c++11 -Wall -Wextra -Wunused-variable -Wfatal-errors
INCS = -I$(INCROOT) -I/usr/include/freetype2 -I$(EXTRLIB) INCS = -I$(INCROOT) -I/usr/include/freetype2 -I$(EXTRLIB)
BIN = libnana.a BIN = libnana.a
SRC_NANA = $(wildcard $(SRCROOT)/*.cpp) TARGET = ../bin/$(BIN)
SRC_DETAIL = $(wildcard $(SRCROOT)/detail/*.cpp)
SRC_FILESYSTEM = $(wildcard $(SRCROOT)/filesystem/*.cpp)
SRC_AUDIO = $(wildcard $(SRCROOT)/audio/*.cpp)
SRC_AUDIO_DETAIL = $(wildcard $(SRCROOT)/audio/detail/*.cpp)
SRC_GUI = $(wildcard $(SRCROOT)/gui/*.cpp)
SRC_GUI_DETAIL = $(wildcard $(SRCROOT)/gui/detail/*.cpp)
SRC_GUI_WIDGETS = $(wildcard $(SRCROOT)/gui/widgets/*.cpp)
SRC_GUI_WIDGETS_SKELETONS = $(wildcard $(SRCROOT)/gui/widgets/skeletons/*.cpp)
SRC_PAINT = $(wildcard $(SRCROOT)/paint/*.cpp)
SRC_PAINT_DETAIL = $(wildcard $(SRCROOT)/paint/detail/*.cpp)
SRC_SYSTEM = $(wildcard $(SRCROOT)/system/*.cpp)
SRC_THREADS= $(wildcard $(SRCROOT)/threads/*.cpp)
SOURCES = $(SRC_NANA) $(SRC_DETAIL) $(SRC_FILESYSTEM) $(SRC_AUDIO) $(SRC_AUDIO_DETAIL) $(SRC_GUI) $(SRC_GUI_DETAIL) $(SRC_GUI_WIDGETS) $(SRC_GUI_WIDGETS_SKELETONS) $(SRC_PAINT) $(SRC_PAINT_DETAIL) $(SRC_SYSTEM) $(SRC_THREADS) .PHONY: all clean install print
LINKOBJ = $(SOURCES:.cpp=.o) all: $(TARGET)
$(BIN): $(LINKOBJ) define walk
ar r ../bin/$(BIN) $(LINKOBJ) $(wildcard $(1)) $(foreach e, $(wildcard $(1)/*), $(call walk, $(e)))
ranlib ../bin/$(BIN) endef
.cpp.o: SRCFILES := $(filter %.cpp,$(patsubst ./%,%,$(filter-out .,$(call walk, $(SRCROOT)))))
$(GCC) -g -c $< -o $@ $(INCS) -std=c++11 -Wall
LINKOBJ = $(patsubst $(SRCROOT)/%.cpp,$(OUTROOT)/objs/%.o,$(SRCFILES))
print:
@echo $(LINKOBJ)
$(TARGET): $(LINKOBJ)
mkdir -p $(dir $@)
ar rus $@ $?
ranlib $@
$(OUTROOT)/objs/%.o: $(SRCROOT)/%.cpp
@mkdir -p $(dir $@)
$(GCC) -o $@ -c $< $(INCS) $(CXXFLAGS)
clean: clean:
rm -f $(LINKOBJ) rm -f $(LINKOBJ)
rm -f ../bin/$(BIN) rm -f $(TARGET)
install:
@mkdir -p $(INSTALL_PREFIX)/include
@mkdir -p $(INSTALL_PREFIX)/bin
@mkdir -p $(INSTALL_PREFIX)/lib
cp -rfl $(INCROOT)/* $(INSTALL_PREFIX)/include
cp -rfl $(TARGET) $(INSTALL_PREFIX)/lib/

2
include/nana/config.hpp
View File

@ -95,7 +95,7 @@
//This marco is defined since 1.4 and until 1.5 for deprecating frame widget. //This marco is defined since 1.4 and until 1.5 for deprecating frame widget.
//This marco and class frame will be removed in version 1.5 //This marco and class frame will be removed in version 1.5
#define WIDGET_FRAME_DEPRECATED //#define WIDGET_FRAME_DEPRECATED
/////////////////// ///////////////////
// Support for NANA_AUTOMATIC_GUI_TESTING // Support for NANA_AUTOMATIC_GUI_TESTING