* disable upx for win32, resolves #20772

git-svn-id: trunk@19745 -
This commit is contained in:
florian 2011-12-04 15:29:14 +00:00
parent 9b7ea86332
commit 3abd84d8d2
2 changed files with 2281 additions and 2210 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1123,8 +1123,11 @@ ifndef UPXPROG
ifeq ($(OS_TARGET),go32v2)
UPXPROG:=1
endif
# today's harddisks are large enough so using upx
# makes no sense especially because it causes
# some trouble, see e.g. #20772
ifeq ($(OS_TARGET),win32)
UPXPROG:=1
UPXPROG:=
endif
ifdef UPXPROG
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))