mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-10-05 19:20:23 +08:00
Code Issues Releases Wiki Activity

Makefile updates.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2007-12-18 22:37:30 +01:00
parent 1cb1427050
commit d4a6a5216d
1 changed files with 95 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
src/stub/src/arch/i086/Makefile.extra
View File

@ -38,19 +38,34 @@ __minienv_varlist = $(foreach v,$1,$(if $($v),$v))
# enumerate the names of all environment variables # enumerate the names of all environment variables
__minienv_expand = $(foreach v,$(call __minienv_varlist,$1),$v='$($v)') __minienv_expand = $(foreach v,$(call __minienv_varlist,$1),$v='$($v)')
DOSBOX = true ifndef DOSBOX
DOSBOX = dosbox DOSBOX := $(shell which dosbox 2>/dev/null)
DOSBOX = /usr/bin/time -p dosbox -exit endif
ifdef DOSBOX
ifndef RUN_DOSBOX
RUN_DOSBOX = $(DOSBOX)
RUN_DOSBOX = /usr/bin/time -p $(DOSBOX) -exit
endif
endif
ifneq ($(wildcard /usr/bin/wine /usr/local/bin/wine),) ifndef WINE
WINE := $(shell which wine 2>/dev/null)
endif
ifdef WINE
ifndef WINEPATH
WINEPATH := $(shell which winepath 2>/dev/null)
endif
endif
ifdef WINE
##WINEENV = @env ##WINEENV = @env
WINEENV = @env -i $(call __minienv_expand,DISPLAY HOME LANG LC_ALL PATH USER TERM WINEPREFIX) WINEENV = @env -i $(call __minienv_expand,DISPLAY HOME LANG LC_ALL PATH USER TERM WINEPREFIX)
ifdef WINEPREFIX ifdef WINEPREFIX
winedir_s = z:$(shell WINEPREFIX='$(WINEPREFIX)' winepath -s '$(realpath $1)') winedir_s = z:$(shell WINEPREFIX='$(WINEPREFIX)' $(WINEPATH) -s '$(realpath $1)')
winedir_w = $(shell WINEPREFIX='$(WINEPREFIX)' winepath -w '$(realpath $1)') winedir_w = $(shell WINEPREFIX='$(WINEPREFIX)' $(WINEPATH) -w '$(realpath $1)')
else else
winedir_s = z:$(shell winepath -s '$(realpath $1)') winedir_s = z:$(shell $(WINEPATH) -s '$(realpath $1)')
winedir_w = $(shell winepath -w '$(realpath $1)') winedir_w = $(shell $(WINEPATH) -w '$(realpath $1)')
endif endif
else else
WINEENV = false 'WINEENV' WINEENV = false 'WINEENV'
@ -60,7 +75,8 @@ endif
# work around limitations of wine's cmd.exe # work around limitations of wine's cmd.exe
define mkbat define mkbat
$(ECHO_E) '@set PATH=$3;%PATH%' > $1 rm -f $1
$(ECHO_E) '@set PATH=$3;%PATH%' >> $1
$(ECHO_E) '@set INCLUDE=$4' >> $1 $(ECHO_E) '@set INCLUDE=$4' >> $1
$(ECHO_E) '@set LIB=$5' >> $1 $(ECHO_E) '@set LIB=$5' >> $1
$(ECHO_E) '@set a=%1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1 $(ECHO_E) '@set a=%1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1
@ -73,7 +89,7 @@ define mkbat
$(UNIX2DOS) $1 $(UNIX2DOS) $1
endef endef
TMP_DEPS = tmp/.tmp-stamp tmp/bcc.bat tmp/cl.bat tmp/dmc.bat TMP_DEPS = tmp/.tmp-stamp tmp/bcc.bat tmp/bcc.rsp tmp/cl.bat tmp/cl.rsp tmp/dmc.bat tmp/dmc.rsp
tmp/bcc.bat: tmp/.tmp-stamp $(MAKEFILE_LIST) tmp/bcc.bat: tmp/.tmp-stamp $(MAKEFILE_LIST)
@$(call mkbat,$@,bcc.exe,$(call winedir_w,$(BC502DIR)/bin)) @$(call mkbat,$@,bcc.exe,$(call winedir_w,$(BC502DIR)/bin))
@ -82,6 +98,34 @@ tmp/cl.bat: tmp/.tmp-stamp $(MAKEFILE_LIST)
tmp/dmc.bat: tmp/.tmp-stamp $(MAKEFILE_LIST) tmp/dmc.bat: tmp/.tmp-stamp $(MAKEFILE_LIST)
@$(call mkbat,$@,dmc.exe,$(call winedir_w,$(DM849DIR)/bin)) @$(call mkbat,$@,dmc.exe,$(call winedir_w,$(DM849DIR)/bin))
tmp/bcc.rsp: tmp/.tmp-stamp $(MAKEFILE_LIST)
@rm -f $@
@$(ECHO_E) '-D__INT_MAX__=32767' >> $@
@$(ECHO_E) '-DWITH_LZMA=$(UPX_LZMA_VERSION)' >> $@
ifneq ($(findstring .$(UPX_LZMA_VERSION).,.0x449.0x457.),)
@$(ECHO_E) '-I$(subst \,/,$(call winedir_w,$(UPX_LZMADIR)/C/Compress/Lzma))' >> $@
else
@$(ECHO_E) '-I$(subst \,/,$(call winedir_w,$(UPX_LZMADIR)/C/7zip/Compress/LZMA_C))' >> $@
endif
@$(ECHO_E) '-I$(top_srcdir)/src' >> $@
@$(UNIX2DOS) $@
tmp/cl.rsp: tmp/.tmp-stamp $(MAKEFILE_LIST)
@rm -f $@
@$(ECHO_E) '-D__INT_MAX__=32767' >> $@
@$(ECHO_E) '-DWITH_LZMA=$(UPX_LZMA_VERSION)' >> $@
@$(ECHO_E) '-I$(call winedir_w,$(UPX_LZMADIR))' >> $@
@$(ECHO_E) '-I$(call winedir_w,$(top_srcdir)/src)' >> $@
@$(UNIX2DOS) $@
tmp/dmc.rsp: tmp/.tmp-stamp $(MAKEFILE_LIST)
@rm -f $@
@$(ECHO_E) '-D__INT_MAX__=32767' >> $@
@$(ECHO_E) '-DWITH_LZMA=$(UPX_LZMA_VERSION)' >> $@
@$(ECHO_E) '-I$(call winedir_w,$(UPX_LZMADIR))' >> $@
@$(ECHO_E) '-I$(call winedir_w,$(top_srcdir)/src)' >> $@
@$(UNIX2DOS) $@
# /*********************************************************************** # /***********************************************************************
# // method-lzma # // method-lzma
@ -99,51 +143,41 @@ $c += -I$(UPX_LZMADIR)
$c += -I$(top_srcdir)/src $c += -I$(top_srcdir)/src
# Borland C/C++ 5.02 # Borland C/C++ 5.02
ifdef WINE
ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),) ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),)
c := tc.method-lzma.bcc c := tc.method-lzma.bcc
$c = $(WINEENV) wine cmd.exe /c tmp/bcc.bat $c = $(WINEENV) $(WINE) cmd.exe /c tmp/bcc.bat
$c += -ms $c += -ms
$c += -O1 -1 $c += -O1 -1
$c += -w $c += -w
$c += -D__INT_MAX__=32767 $c += @tmp/bcc.rsp
$c += -DWITH_LZMA=$(UPX_LZMA_VERSION)
ifneq ($(findstring .$(UPX_LZMA_VERSION).,.0x449.0x457.),)
$c += -I$(subst \,/,$(call winedir_w,$(UPX_LZMADIR)/C/Compress/Lzma))
else
$c += -I$(subst \,/,$(call winedir_w,$(UPX_LZMADIR)/C/7zip/Compress/LZMA_C))
endif endif
$c += -I$(top_srcdir)/src
endif endif
# Digital Mars C/C++ 8.49 # Digital Mars C/C++ 8.49
# http://www.digitalmars.com/download/freecompiler.html # http://www.digitalmars.com/download/freecompiler.html
ifdef WINE
ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),) ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),)
c := tc.method-lzma.dmc c := tc.method-lzma.dmc
$c = $(WINEENV) DMC1='$(DMC1)' DMC2='$(DMC2)' wine cmd.exe /c tmp/dmc.bat $c = $(WINEENV) $(WINE) cmd.exe /c tmp/dmc.bat
$c += -ms -R $c += -ms -R
$c += -NS $c += -NS
$c += -w- -w7 -r $c += -w- -w7 -r
$c += @DMC1 @DMC2 $c += -o -0
DMC1 := -o -0 $c += @tmp/dmc.rsp
DMC1 += -D__INT_MAX__=32767 endif
DMC1 += -DWITH_LZMA=$(UPX_LZMA_VERSION)
DMC2 := -I$(call winedir_w,$(UPX_LZMADIR))
DMC2 += -I$(call winedir_w,$(top_srcdir)/src)
endif endif
# Visual C/C++ 1.52 (8.00c) # Visual C/C++ 1.52 (8.00c)
ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),) ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),)
c := tc.method-lzma.cl c := tc.method-lzma.cl
$c = $(WINEENV) CL='$(CL)' wine cmd.exe /c tmp/cl.bat $c = $(WINEENV) $(WINE) cmd.exe /c tmp/cl.bat
$c += -nologo
$c += -AS -Gd $c += -AS -Gd
$c += -Gy $c += -Gy
$c += -O2 -Gf -Gs -G0 $c += -O2 -Gf -Gs -G0
$c += -W4 $c += -W4
CL := -nologo $c += @tmp/cl.rsp
CL += -D__INT_MAX__=32767
CL += -DWITH_LZMA=$(UPX_LZMA_VERSION)
CL += -I$(call winedir_s,$(UPX_LZMADIR))
CL += -I$(call winedir_s,$(top_srcdir)/src)
endif endif
# Open Watcom C/C++ 1.6 # Open Watcom C/C++ 1.6
@ -179,18 +213,24 @@ tmp/lzma_d_c%.i : tmp/lzma_d_c%.S $(MAKEFILE_LIST)
tmp/lzma_d_c%.S : lzma_d_c.c wdis2gas.py $(MAKEFILE_LIST) $(TMP_DEPS) tmp/lzma_d_c%.S : lzma_d_c.c wdis2gas.py $(MAKEFILE_LIST) $(TMP_DEPS)
rm -f tmp/$T*.i tmp/$T*.o tmp/$T*.obj tmp/$T*.S rm -f tmp/$T*.i tmp/$T*.o tmp/$T*.obj tmp/$T*.S
# compile # compile
ifdef WINE
ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),) ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),)
## $(call tc,bcc) $(PP_FLAGS) -c -otmp/$T_bc.obj $< ## $(call tc,bcc) $(PP_FLAGS) -c -otmp/$T_bc.obj $<
## $(call tc,wdis) tmp/$T_bc.obj | $(RTRIM) > tmp/$T_bc.obj.disasm ## $(call tc,wdis) tmp/$T_bc.obj | $(RTRIM) > tmp/$T_bc.obj.disasm
endif endif
endif
ifdef WINE
ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),) ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),)
$(call tc,dmc) $(PP_FLAGS) -c -otmp/$T_dm.obj $< $(call tc,dmc) $(PP_FLAGS) -c -otmp/$T_dm.obj $<
$(call tc,wdis) tmp/$T_dm.obj | $(RTRIM) > tmp/$T_dm.obj.disasm $(call tc,wdis) tmp/$T_dm.obj | $(RTRIM) > tmp/$T_dm.obj.disasm
endif endif
endif
ifdef WINE
ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),) ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),)
$(call tc,cl) $(PP_FLAGS) -c -Fotmp/$T_vc.obj $< $(call tc,cl) $(PP_FLAGS) -c -Fotmp/$T_vc.obj $<
$(call tc,wdis) tmp/$T_vc.obj | $(RTRIM) > tmp/$T_vc.obj.disasm $(call tc,wdis) tmp/$T_vc.obj | $(RTRIM) > tmp/$T_vc.obj.disasm
endif endif
endif
ifneq ($(wildcard $(WATCOM)/binl/wcl),) ifneq ($(wildcard $(WATCOM)/binl/wcl),)
$(call tc,wcl) $(PP_FLAGS) -c -fo=tmp/$T_wc.obj $< $(call tc,wcl) $(PP_FLAGS) -c -fo=tmp/$T_wc.obj $<
$(call tc,wdis) tmp/$T_wc.obj | $(RTRIM) > tmp/$T_wc.obj.disasm $(call tc,wdis) tmp/$T_wc.obj | $(RTRIM) > tmp/$T_wc.obj.disasm
@ -217,6 +257,7 @@ ifneq ($(wildcard $(WATCOM)/binl/wdis),)
CC_TEST_DEPS = $(MAKEFILE_LIST) $(TMP_DEPS) CC_TEST_DEPS = $(MAKEFILE_LIST) $(TMP_DEPS)
ifdef WINE
ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),) ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),)
cc_test_bc : tc_list = method-lzma arch-i086 default cc_test_bc : tc_list = method-lzma arch-i086 default
cc_test_bc: cc_test.c $(CC_TEST_DEPS) cc_test_bc: cc_test.c $(CC_TEST_DEPS)
@ -224,7 +265,9 @@ cc_test_bc: cc_test.c $(CC_TEST_DEPS)
$(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm $(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm
cc_test-all: cc_test_bc cc_test-all: cc_test_bc
endif endif
endif
ifdef WINE
ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),) ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),)
cc_test_dm : tc_list = method-lzma arch-i086 default cc_test_dm : tc_list = method-lzma arch-i086 default
cc_test_dm: cc_test.c $(CC_TEST_DEPS) cc_test_dm: cc_test.c $(CC_TEST_DEPS)
@ -232,7 +275,9 @@ cc_test_dm: cc_test.c $(CC_TEST_DEPS)
$(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm $(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm
cc_test-all: cc_test_dm cc_test-all: cc_test_dm
endif endif
endif
ifdef WINE
ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),) ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),)
cc_test_vc : tc_list = method-lzma arch-i086 default cc_test_vc : tc_list = method-lzma arch-i086 default
cc_test_vc: cc_test.c $(CC_TEST_DEPS) cc_test_vc: cc_test.c $(CC_TEST_DEPS)
@ -240,6 +285,7 @@ cc_test_vc: cc_test.c $(CC_TEST_DEPS)
$(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm $(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm
cc_test-all: cc_test_vc cc_test-all: cc_test_vc
endif endif
endif
ifneq ($(wildcard $(WATCOM)/binl/wcl),) ifneq ($(wildcard $(WATCOM)/binl/wcl),)
cc_test_wc : tc_list = method-lzma arch-i086 default cc_test_wc : tc_list = method-lzma arch-i086 default
@ -266,35 +312,47 @@ tmp/l_test_gcc_i386.out: l_test.c $(L_TEST_DEPS)
./$@ ./$@
l_test-all: tmp/l_test_gcc_i386.out l_test-all: tmp/l_test_gcc_i386.out
ifdef WINE
ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),) ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),)
tmp/l_test_bc.% : tc_list = method-lzma arch-i086 default tmp/l_test_bc.% : tc_list = method-lzma arch-i086 default
tmp/l_test_bc.exe: l_test.c $(L_TEST_DEPS) tmp/l_test_bc.exe: l_test.c $(L_TEST_DEPS)
@rm -f l_test.o l_test.obj tmp/test.exe $@ @rm -f l_test.o l_test.obj tmp/test.exe $@
$(call tc,bcc) -o$(subst /,\\,$@) $< $(call tc,bcc) -o$(subst /,\\,$@) $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe ifdef RUN_DOSBOX
cp -p $@ tmp/test.exe && $(RUN_DOSBOX) tmp/test.exe
endif
##l_test-all: tmp/l_test_bc.exe ##l_test-all: tmp/l_test_bc.exe
endif endif
endif
ifdef WINE
ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),) ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),)
tmp/l_test_dm.% : tc_list = method-lzma arch-i086 default tmp/l_test_dm.% : tc_list = method-lzma arch-i086 default
tmp/l_test_dm.exe: l_test.c $(L_TEST_DEPS) tmp/l_test_dm.exe: l_test.c $(L_TEST_DEPS)
@rm -f l_test.o l_test.obj tmp/test.exe $@ @rm -f l_test.o l_test.obj tmp/test.exe $@
$(call tc,dmc) -ml -o$(subst /,\\,$@) $< $(call tc,dmc) -ml -o$(subst /,\\,$@) $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe ifdef RUN_DOSBOX
cp -p $@ tmp/test.exe && $(RUN_DOSBOX) tmp/test.exe
endif
l_test-all: tmp/l_test_dm.exe l_test-all: tmp/l_test_dm.exe
endif endif
endif
ifdef WINE
ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),) ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),)
tmp/l_test_vc.% : tc_list = method-lzma arch-i086 default tmp/l_test_vc.% : tc_list = method-lzma arch-i086 default
tmp/l_test_vc.exe: l_test.c $(L_TEST_DEPS) tmp/l_test_vc.exe: l_test.c $(L_TEST_DEPS)
@rm -f l_test.o l_test.obj tmp/test.exe $@ @rm -f l_test.o l_test.obj tmp/test.exe $@
$(call tc,cl) -Fe$(subst /,\\,$@) $< $(call tc,cl) -Fe$(subst /,\\,$@) $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe ifdef RUN_DOSBOX
cp -p $@ tmp/test.exe && $(RUN_DOSBOX) tmp/test.exe
endif
l_test-all: tmp/l_test_vc.exe l_test-all: tmp/l_test_vc.exe
endif endif
endif
ifneq ($(wildcard $(WATCOM)/binl/wcl),) ifneq ($(wildcard $(WATCOM)/binl/wcl),)
tmp/l_test_wc.% : tc_list = method-lzma arch-i086 default tmp/l_test_wc.% : tc_list = method-lzma arch-i086 default
@ -302,7 +360,9 @@ tmp/l_test_wc.exe: l_test.c $(L_TEST_DEPS)
@rm -f l_test.o l_test.obj tmp/test.exe $@ @rm -f l_test.o l_test.obj tmp/test.exe $@
$(call tc,wcl) -fe=$@ $< $(call tc,wcl) -fe=$@ $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe ifdef RUN_DOSBOX
cp -p $@ tmp/test.exe && $(RUN_DOSBOX) tmp/test.exe
endif
l_test-all: tmp/l_test_wc.exe l_test-all: tmp/l_test_wc.exe
endif endif