Merge branch 'next' into msvc2

This commit is contained in:
Nguyen Anh Quynh 2014-05-10 19:46:37 +08:00
commit b07523ff26
2 changed files with 4 additions and 4 deletions

View File

@ -266,9 +266,9 @@ PKGCFGF = $(BLDIR)/$(LIBNAME).pc
all: $(LIBRARY) $(ARCHIVE) $(PKGCFGF)
ifndef BUILDDIR
$(MAKE) -C tests
$(MAKE) -C tests LDFLAGS=
else
$(MAKE) -C tests BUILDDIR=$(BLDIR)
$(MAKE) -C tests BUILDDIR=$(BLDIR) LDFLAGS=
endif
ifeq ($(CAPSTONE_SHARED),yes)
$(INSTALL_DATA) $(BLDIR)/lib$(LIBNAME).$(EXT) $(BLDIR)/tests/

View File

@ -25,8 +25,8 @@ CC = $(CROSS)gcc
endif
CFLAGS = -O3 -Wall -I$(INCDIR)
LDFLAGS = -L$(LIBDIR)
CFLAGS += -O3 -Wall -I$(INCDIR)
LDFLAGS += -L$(LIBDIR)
LIBNAME = capstone