mirror of
https://github.com/upx/upx
synced 2025-09-28 19:06:07 +08:00
merge
This commit is contained in:
commit
4b0ebf2b80
16
src/Makefile
16
src/Makefile
|
@ -53,13 +53,13 @@ INCLUDES += -I$(UPX_LZMADIR)
|
||||||
endif
|
endif
|
||||||
# you should set envvar UPX_LUADIR to point to your unpacked lua-5.1.1.tar.gz
|
# you should set envvar UPX_LUADIR to point to your unpacked lua-5.1.1.tar.gz
|
||||||
ifneq ($(wildcard $(UPX_LUADIR)/src/lua.h),)
|
ifneq ($(wildcard $(UPX_LUADIR)/src/lua.h),)
|
||||||
DEFS += -DWITH_LUA
|
##DEFS += -DWITH_LUA
|
||||||
upx_SOURCES_LUA := $(wildcard $(UPX_LUADIR)/src/*.c)
|
##upx_SOURCES_LUA := $(wildcard $(UPX_LUADIR)/src/*.c)
|
||||||
upx_SOURCES_LUA := $(filter-out %lua.c, $(upx_SOURCES_LUA))
|
##upx_SOURCES_LUA := $(filter-out %lua.c, $(upx_SOURCES_LUA))
|
||||||
upx_SOURCES_LUA := $(filter-out %luac.c, $(upx_SOURCES_LUA))
|
##upx_SOURCES_LUA := $(filter-out %luac.c, $(upx_SOURCES_LUA))
|
||||||
upx_OBJECTS_LUA := $(notdir $(upx_SOURCES_LUA:.c=$(objext)))
|
##upx_OBJECTS_LUA := $(notdir $(upx_SOURCES_LUA:.c=$(objext)))
|
||||||
upx_OBJECTS_LUA := $(addprefix lua_,$(upx_OBJECTS_LUA))
|
##upx_OBJECTS_LUA := $(addprefix lua_,$(upx_OBJECTS_LUA))
|
||||||
upx_OBJECTS += $(upx_OBJECTS_LUA)
|
##upx_OBJECTS += $(upx_OBJECTS_LUA)
|
||||||
else
|
else
|
||||||
##$(error please set UPX_LUADIR)
|
##$(error please set UPX_LUADIR)
|
||||||
endif
|
endif
|
||||||
|
@ -89,10 +89,12 @@ compress_lzma$(objext) : CXXFLAGS += -Wno-unused
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_GNUC),1)
|
ifeq ($(USE_GNUC),1)
|
||||||
|
ifneq ($(strip $(upx_OBJECTS_LUA)),)
|
||||||
$(upx_OBJECTS_LUA) : CXXFLAGS += -Wno-cast-align
|
$(upx_OBJECTS_LUA) : CXXFLAGS += -Wno-cast-align
|
||||||
$(upx_OBJECTS_LUA) : CXXFLAGS += -Wno-cast-qual
|
$(upx_OBJECTS_LUA) : CXXFLAGS += -Wno-cast-qual
|
||||||
$(upx_OBJECTS_LUA) : CXXFLAGS += -Wno-error
|
$(upx_OBJECTS_LUA) : CXXFLAGS += -Wno-error
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
mostlyclean clean distclean maintainer-clean:
|
mostlyclean clean distclean maintainer-clean:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user