Merge remote-tracking branch 'cnjinhao/hotfix-1.5.5' into hotfix-1.5.4

This commit is contained in:
qPCR4vir
2017-09-07 12:36:50 +02:00
8 changed files with 292 additions and 251 deletions

View File

@@ -14,7 +14,7 @@ NANAINC = $(NANAPATH)/include
NANALIB = $(NANAPATH)/build/bin
INCS = -I$(NANAINC)
LIBS = -L$(NANALIB) -lnana -lX11 -lpthread -lrt -lXft -lpng -lasound
LIBS = -L$(NANALIB) -lnana -lX11 -lpthread -lrt -lXft -lpng -lasound -lfontconfig
LINKOBJ = $(SOURCES:.cpp=.o)