From 9169ac75418120d8d10b9a33ee563d07a0663008 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Wed, 3 Oct 2012 14:19:32 +0200 Subject: [PATCH] Make sure we're always building luajit statically, so ld doesn't pick a shared version. Of course that explained the size difference :D. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 474ed55b0..647573fba 100644 --- a/Makefile +++ b/Makefile @@ -130,10 +130,10 @@ kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o drawcontext.o input.o $(POPENNS -L$(CRENGINEDIR)/thirdparty/antiword \ -L$(MUPDFLIBDIR) \ -o $@ \ - -lm -ldl -lpthread \ + -lm -lpthread \ -lpopen_noshell \ -lfitz -lfreetype -lopenjpeg -ljbig2dec -ljpeg -lz \ - -lluajit \ + -lluajit -ldl \ -ldjvulibre \ -lcrengine -lchmlib -lpng -lantiword \ $(EMU_LDFLAGS) \ @@ -237,10 +237,10 @@ $(CRENGINELIBS): $(LUALIB): ifdef EMULATE_READER - $(MAKE) -C $(LUADIR) + $(MAKE) -C $(LUADIR) BUILDMODE=static else # To recap: build its TARGET_CC from CROSS+CC, so we need HOSTCC in CC. Build its HOST/TARGET_CFLAGS based on CFLAGS, so we need a neutral CFLAGS without arch - $(MAKE) -C $(LUADIR) CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" CFLAGS="$(BASE_CFLAGS)" HOST_CFLAGS="$(HOSTCFLAGS)" TARGET_CFLAGS="$(CFLAGS)" CROSS="$(CHOST)-" TARGET_FLAGS="-DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2" + $(MAKE) -C $(LUADIR) BUILDMODE=static CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" CFLAGS="$(BASE_CFLAGS)" HOST_CFLAGS="$(HOSTCFLAGS)" TARGET_CFLAGS="$(CFLAGS)" CROSS="$(CHOST)-" TARGET_FLAGS="-DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2" endif $(POPENNSLIB):