yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 00:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into noglib

Browse source
This commit is contained in:
Nguyen Anh Quynh 2016-12-26 13:46:38 +08:00
parent b34109fb0d 8a9a5432c3
commit 14ab8df36b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -207,7 +207,7 @@ qemu/config-host.h-timestamp:
unicorn: $(LIBRARY) $(ARCHIVE) unicorn: $(LIBRARY) $(ARCHIVE)
$(LIBRARY): qemu/config-host.h-timestamp uc.o list.o $(LIBRARY): qemu/config-host.h-timestamp
ifeq ($(UNICORN_SHARED),yes) ifeq ($(UNICORN_SHARED),yes)
ifeq ($(V),0) ifeq ($(V),0)
$(call log,GEN,$(LIBRARY)) $(call log,GEN,$(LIBRARY))
@ -219,7 +219,7 @@ else
endif endif
endif endif
$(ARCHIVE): qemu/config-host.h-timestamp uc.o list.o $(ARCHIVE): qemu/config-host.h-timestamp
ifeq ($(UNICORN_STATIC),yes) ifeq ($(UNICORN_STATIC),yes)
ifeq ($(V),0) ifeq ($(V),0)
$(call log,GEN,$(ARCHIVE)) $(call log,GEN,$(ARCHIVE))

3
install-cmocka-linux.sh
View file

@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
set -ex set -ex
mkdir cmocka 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 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 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 # cmake builds an so instead of a dll in mingw/msys