mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-23 10:05:40 +00:00
merge conflicts
This commit is contained in:
commit
b05087d314
4
Makefile
4
Makefile
|
@ -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))
|
||||||
|
|
|
@ -9,7 +9,13 @@ SAMPLE := $(SAMPLE:sample_batch_reg=)
|
||||||
SAMPLE := $(SAMPLE:sample_x86_32_gdt_and_seg_regs=)
|
SAMPLE := $(SAMPLE:sample_x86_32_gdt_and_seg_regs=)
|
||||||
SAMPLE := $(SAMPLE:shellcode=)
|
SAMPLE := $(SAMPLE:shellcode=)
|
||||||
|
|
||||||
|
UNAME_S := $(shell uname -s)
|
||||||
|
ifeq ($(UNAME_S), Linux)
|
||||||
|
ENV_VARS = LD_PRELOAD=librt.so LD_LIBRARY_PATH=../ DYLD_LIBRARY_PATH=../
|
||||||
|
else
|
||||||
ENV_VARS = LD_LIBRARY_PATH=../ DYLD_LIBRARY_PATH=../
|
ENV_VARS = LD_LIBRARY_PATH=../ DYLD_LIBRARY_PATH=../
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
.PHONY: build install python c clean check test
|
.PHONY: build install python c clean check test
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -ex
|
set -ex
|
||||||
mkdir cmocka
|
mkdir -p 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
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
CFLAGS += -Wall -Werror -I../../include
|
CFLAGS += -Wall -Werror -I../../include
|
||||||
LDLIBS += -L../../ -lpthread -lm -lunicorn
|
LDLIBS += -L../../ -lpthread -lm -lunicorn
|
||||||
|
|
||||||
|
UNAME_S := $(shell uname -s)
|
||||||
|
ifeq ($(UNAME_S), Linux)
|
||||||
|
LDLIBS += -lrt
|
||||||
|
endif
|
||||||
|
|
||||||
EXECUTE_VARS = LD_LIBRARY_PATH=../../cmocka/src:../../ DYLD_LIBRARY_PATH=../../
|
EXECUTE_VARS = LD_LIBRARY_PATH=../../cmocka/src:../../ DYLD_LIBRARY_PATH=../../
|
||||||
|
|
||||||
TESTS_SOURCE = $(wildcard *.c)
|
TESTS_SOURCE = $(wildcard *.c)
|
||||||
|
|
|
@ -3,6 +3,12 @@ CFLAGS += -L ../../ -I ../../include
|
||||||
CFLAGS += -L ../../cmocka/src -I ../../cmocka/include
|
CFLAGS += -L ../../cmocka/src -I ../../cmocka/include
|
||||||
LDLIBS += -lcmocka -lunicorn
|
LDLIBS += -lcmocka -lunicorn
|
||||||
|
|
||||||
|
UNAME_S := $(shell uname -s)
|
||||||
|
ifeq ($(UNAME_S), Linux)
|
||||||
|
LDLIBS += -lrt
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
EXECUTE_VARS = LD_LIBRARY_PATH=../../cmocka/src:../../ DYLD_LIBRARY_PATH=../../
|
EXECUTE_VARS = LD_LIBRARY_PATH=../../cmocka/src:../../ DYLD_LIBRARY_PATH=../../
|
||||||
|
|
||||||
ifeq ($(UNICORN_ASAN),yes)
|
ifeq ($(UNICORN_ASAN),yes)
|
||||||
|
|
Loading…
Reference in a new issue