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

Makefile: Rename TARGET_DIRS to TARGET_LIST

Browse source 
To be more accurate on its purpose and make code that looks for a certain
target out of this variable more readable.

Backports commit 208ecb3e1acc8d55dab49fdf721a86d513691688 from qemu
This commit is contained in:
Fam Zheng 2018-06-08 19:22:32 -04:00 committed by Lioncash
parent 10e2b13650
commit 666130cb41
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
msvc/README.TXT
View file

@ -132,7 +132,7 @@ QEMU_CFLAGS+=-include x86_64.h
VERSION=2.2.1 VERSION=2.2.1
PKGVERSION= PKGVERSION=
SRC_PATH=/f/GitHub/unicorn/qemu SRC_PATH=/f/GitHub/unicorn/qemu
TARGET_DIRS=x86_64-softmmu arm-softmmu m68k-softmmu aarch64-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu sparc-softmmu sparc64-softmmu TARGET_LIST=x86_64-softmmu arm-softmmu m68k-softmmu aarch64-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu sparc-softmmu sparc64-softmmu
GLIB_CFLAGS=-pthread -mms-bitfields -IC:/msys64/mingw32/include/glib-2.0 -IC:/msys64/mingw32/lib/glib-2.0/include GLIB_CFLAGS=-pthread -mms-bitfields -IC:/msys64/mingw32/include/glib-2.0 -IC:/msys64/mingw32/lib/glib-2.0/include
CONFIG_ZERO_MALLOC=y CONFIG_ZERO_MALLOC=y
CONFIG_CPUID_H=y CONFIG_CPUID_H=y

14
qemu/Makefile
View file

@ -21,8 +21,8 @@ seems to have been used for an in-tree build. You can fix this by running \
endif endif
endif endif
CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y)
CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y)
CONFIG_ALL=y CONFIG_ALL=y
-include config-all-devices.mak -include config-all-devices.mak
@ -68,8 +68,8 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS) LIBS+=-lz $(LIBS_TOOLS)
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST))
SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST))
ifeq ($(SUBDIR_DEVICES_MAK),) ifeq ($(SUBDIR_DEVICES_MAK),)
config-all-devices.mak: config-all-devices.mak:
@ -125,7 +125,7 @@ all: $(TOOLS) $(HELPERS-y) recurse-all modules
config-host.h: config-host.h-timestamp config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak config-host.h-timestamp: config-host.mak
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST))
SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
$(SOFTMMU_SUBDIR_RULES): $(block-obj-y) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
@ -137,7 +137,7 @@ subdir-%:
$(SUBDIR_RULES): qapi/qapi-types.c qapi/qapi-types.h qapi/qapi-visit.c qapi/qapi-visit.h $(common-obj-y) $(util-obj-y) $(SUBDIR_RULES): qapi/qapi-types.c qapi/qapi-types.h qapi/qapi-visit.c qapi/qapi-visit.h $(common-obj-y) $(util-obj-y)
ALL_SUBDIRS=$(TARGET_DIRS) ALL_SUBDIRS=$(TARGET_LIST)
recurse-all: $(SUBDIR_RULES) recurse-all: $(SUBDIR_RULES)
@ -194,7 +194,7 @@ distclean: clean
rm -f config-host.mak config-host.h* config-host.ld qemu-img-cmds.texi qemu-monitor.texi rm -f config-host.mak config-host.h* config-host.ld qemu-img-cmds.texi qemu-monitor.texi
rm -f config-all-devices.mak config-all-disas.mak rm -f config-all-devices.mak config-all-disas.mak
rm -f config.log rm -f config.log
for d in $(TARGET_DIRS); do \ for d in $(TARGET_LIST); do \
rm -rf $$d || exit 1 ; \ rm -rf $$d || exit 1 ; \
done done
rm -Rf .sdk rm -Rf .sdk

2
qemu/configure vendored
View file

@ -1459,7 +1459,7 @@ if test "$static" = "yes" ; then
echo "CONFIG_STATIC=y" >> $config_host_mak echo "CONFIG_STATIC=y" >> $config_host_mak
fi fi
echo "SRC_PATH=$source_path" >> $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak
echo "TARGET_DIRS=$target_list" >> $config_host_mak echo "TARGET_LIST=$target_list" >> $config_host_mak
if test "$byteswap_h" = "yes" ; then if test "$byteswap_h" = "yes" ; then
echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
fi fi

2
qemu/scripts/create_config
View file

@ -59,7 +59,7 @@ case $line in
target_name=${line#*=} target_name=${line#*=}
echo "#define TARGET_NAME \"$target_name\"" echo "#define TARGET_NAME \"$target_name\""
;; ;;
TARGET_DIRS=*) TARGET_LIST=*)
# do nothing # do nothing
;; ;;
TARGET_*=y) # configuration TARGET_*=y) # configuration