|
|
@@ -1019,8 +1019,6 @@ SHAREDLIBEXT=.so
|
|
|
SHORTSUFFIX=wii
|
|
|
endif
|
|
|
|
|
|
-endif
|
|
|
-
|
|
|
# For 8.3 limited OS's the short suffixes
|
|
|
# Otherwise use the full source/target names
|
|
|
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
|
|
|
@@ -1117,8 +1115,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))))
|
marco