Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Chris Eagle
2015-09-04 10:27:33 -07:00
5 changed files with 11 additions and 6 deletions

View File

@@ -7,7 +7,7 @@ LIBNAME = unicorn
# Find GLIB
ifndef GLIB
GLIB = `pkg-config --libs glib-2.0`
GLIB = $(shell pkg-config --libs glib-2.0)
endif
UNICORN_DEP_LIBS_STATIC += -lpthread -lm $(GLIB)