From 5db2734e6fbec23ce9fd2a2e33722b2d0f7b9892 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Mon, 19 Nov 2007 09:48:27 +0100 Subject: [PATCH] Small Makefile updates. --- src/stub/Makefile | 2 ++ src/stub/src/arch/i086/Makefile.extra | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/stub/Makefile b/src/stub/Makefile index a6595754..5115692a 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -223,6 +223,8 @@ define tc.default.f-embed_objinfo $(call tc,objcopy) -R .comment -R .note -R .note.GNU-stack -R .reginfo $1 $(call tc,objdump) -Dr $(tc_objdump_disasm_options) $1 | $(RTRIM) > $1.disasm $(call tc,objdump) -htr -w $1 | $(BLSQUEEZE) > $1.dump +## TODO: stub: remove filename from dump in order reduce diff noise when renaming files +## $(call tc,objdump) -htr -w $1 | $(BLSQUEEZE) | sed -e '1s/^.*: *file format/file format/' > $1.dump $(call tc,xstrip) --with-dump=$1.dump --create-bindump=$1.bindump $1 cat $1.dump >> $1 endef diff --git a/src/stub/src/arch/i086/Makefile.extra b/src/stub/src/arch/i086/Makefile.extra index 951f9eff..85195270 100644 --- a/src/stub/src/arch/i086/Makefile.extra +++ b/src/stub/src/arch/i086/Makefile.extra @@ -43,10 +43,15 @@ DOSBOX = dosbox DOSBOX = /usr/bin/time -p dosbox -exit ifneq ($(wildcard /usr/bin/wine /usr/local/bin/wine),) -WINEENV = @env -WINEENV = @env -i $(call __minienv_expand,DISPLAY HOME LANG LC_ALL PATH USER TERM) -winedir_s = z:$(shell winepath -s $(realpath $1)) -winedir_w = $(shell winepath -w $(realpath $1)) +##WINEENV = @env +WINEENV = @env -i $(call __minienv_expand,DISPLAY HOME LANG LC_ALL PATH USER TERM WINEPREFIX) +ifdef WINEPREFIX +winedir_s = z:$(shell WINEPREFIX='$(WINEPREFIX)' winepath -s '$(realpath $1)') +winedir_w = $(shell WINEPREFIX='$(WINEPREFIX)' winepath -w '$(realpath $1)') +else +winedir_s = z:$(shell winepath -s '$(realpath $1)') +winedir_w = $(shell winepath -w '$(realpath $1)') +endif else WINEENV = false 'WINEENV' winedir_s = $1