Merge remote-tracking branch 'cnjinhao/hotfix-1.5.5' into hotfix-1.5.4
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user