mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Disable vmlinux for now.

Browse Source 
committer: mfx <mfx> 968541091 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2000-09-09 23:11:31 +00:00
parent 61d7c3beec
commit 6053637c8f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile
View File

@ -13,7 +13,7 @@
ifeq ($(strip $(UCLDIR)),) ifeq ($(strip $(UCLDIR)),)
# change this to reflect where the UCL library is # change this to reflect where the UCL library is
UCLDIR = $(HOME)/local/src/ucl-0.90 UCLDIR = $(HOME)/local/src/ucl-0.91
endif endif
DEBUG = 1 DEBUG = 1
@ -55,7 +55,7 @@ OBJECTS1 = \
packer$o packhead$o packmast$o \ packer$o packhead$o packmast$o \
p_com$o p_djgpp2$o p_exe$o p_lx_elf$o p_lx_sep$o p_lx_sh$o \ p_com$o p_djgpp2$o p_exe$o p_lx_elf$o p_lx_sep$o p_lx_sh$o \
p_sys$o p_tmt$o p_tos$o \ p_sys$o p_tmt$o p_tos$o \
p_unix$o p_vmlinux$o p_w32pe$o p_wcle$o p_unix$o p_w32pe$o p_wcle$o
# no exceptions or RTTI # no exceptions or RTTI
OBJECTS2 = \ OBJECTS2 = \
@ -117,7 +117,8 @@ else
LDFLAGS = -s LDFLAGS = -s
endif endif
LDFLAGS += -Wl,-Map,$(basename $@).map LDFLAGS += -Wl,-Map,$(basename $@).map
LDLIBS = -lz LDLIBS =
##LDLIBS = -lz
LIBDIRS = LIBDIRS =
@ -254,11 +255,13 @@ export LIB
ifeq (1,2) ifeq (1,2)
# statically link libc # statically link libc
CC += -ML CC += -ML
LDLIBS = $(u)_s.lib zlib_s.lib setargv.obj ##LDLIBS = $(u)_s.lib zlib_s.lib setargv.obj
LDLIBS = $(u)_s.lib setargv.obj
else else
# link against msvcrt.dll # link against msvcrt.dll
CC += -MD CC += -MD
LDLIBS = $(u).lib zlib.lib setargv.obj ##LDLIBS = $(u).lib zlib.lib setargv.obj
LDLIBS = $(u).lib setargv.obj
endif endif
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
CFLAGS += -Od -ZI CFLAGS += -Od -ZI

2
src/packmast.cpp
View File

@ -169,8 +169,10 @@ static Packer* try_packers(InputFile *f, try_function func)
return p; return p;
if ((p = func(new PackLinuxI386sh(f),f)) != NULL) if ((p = func(new PackLinuxI386sh(f),f)) != NULL)
return p; return p;
#if 0
if ((p = func(new PackBvmlinuxI386(f),f)) != NULL) if ((p = func(new PackBvmlinuxI386(f),f)) != NULL)
return p; return p;
#endif
if ((p = func(new PackLinuxI386(f),f)) != NULL) if ((p = func(new PackLinuxI386(f),f)) != NULL)
return p; return p;
if ((p = func(new PackSys(f),f)) != NULL) if ((p = func(new PackSys(f),f)) != NULL)