Merge branch 'master' into noglib
This commit is contained in:
commit
14ab8df36b
4
Makefile
4
Makefile
@ -207,7 +207,7 @@ qemu/config-host.h-timestamp:
|
||||
|
||||
unicorn: $(LIBRARY) $(ARCHIVE)
|
||||
|
||||
$(LIBRARY): qemu/config-host.h-timestamp uc.o list.o
|
||||
$(LIBRARY): qemu/config-host.h-timestamp
|
||||
ifeq ($(UNICORN_SHARED),yes)
|
||||
ifeq ($(V),0)
|
||||
$(call log,GEN,$(LIBRARY))
|
||||
@ -219,7 +219,7 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
$(ARCHIVE): qemu/config-host.h-timestamp uc.o list.o
|
||||
$(ARCHIVE): qemu/config-host.h-timestamp
|
||||
ifeq ($(UNICORN_STATIC),yes)
|
||||
ifeq ($(V),0)
|
||||
$(call log,GEN,$(ARCHIVE))
|
||||
|
@ -1,7 +1,8 @@
|
||||
#!/bin/sh
|
||||
set -ex
|
||||
mkdir cmocka
|
||||
wget https://cmocka.org/files/1.1/cmocka-1.1.0.tar.xz -O /tmp/cmocka-1.1.0.tar.xz
|
||||
#wget https://cmocka.org/files/1.1/cmocka-1.1.0.tar.xz -O /tmp/cmocka-1.1.0.tar.xz
|
||||
wget --no-check-certificate http://cmocka.org/files/1.1/cmocka-1.1.0.tar.xz -O /tmp/cmocka-1.1.0.tar.xz
|
||||
tar -xf /tmp/cmocka-1.1.0.tar.xz -C /tmp
|
||||
cd cmocka && cmake -DUNIT_TESTING=On /tmp/cmocka-1.1.0 && make && make test
|
||||
# cmake builds an so instead of a dll in mingw/msys
|
||||
|
Loading…
Reference in New Issue
Block a user