Merge branch 'noglib' of https://github.com/cseagle/unicorn into cseagle-noglib

2016-12-19 17:32:27 +08:00
parent 934fa2c90f 5690b7b68f
commit 5f81c00559
79 changed files with 1073 additions and 1358 deletions
--- a/8
+++ b/8
@@ -82,12 +82,6 @@ CC = $(CROSS)-gcc
 AR = $(CROSS)-ar
 RANLIB = $(CROSS)-ranlib
 STRIP = $(CROSS)-strip
-GLIB = "-L/usr/$(CROSS)/lib/ -lglib-2.0"
-endif
-
-# Find GLIB
-ifndef GLIB
-GLIB = `pkg-config --libs glib-2.0`
 endif

 ifeq ($(PKG_EXTRA),)
@@ -195,7 +189,7 @@ else
 PKGCFGDIR ?= $(LIBDATADIR)/pkgconfig
 endif

-$(LIBNAME)_LDFLAGS += $(GLIB) -lm
+$(LIBNAME)_LDFLAGS += -lm

 .PHONY: all
 all: unicorn