Make sure we're always building luajit statically, so ld doesn't pick a

shared version. Of course that explained the size difference :D.
pull/2/merge
NiLuJe 12 years ago committed by Qingping Hou
parent 5a2e4dec99
commit 9169ac7541

@ -130,10 +130,10 @@ kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o drawcontext.o input.o $(POPENNS
-L$(CRENGINEDIR)/thirdparty/antiword \ -L$(CRENGINEDIR)/thirdparty/antiword \
-L$(MUPDFLIBDIR) \ -L$(MUPDFLIBDIR) \
-o $@ \ -o $@ \
-lm -ldl -lpthread \ -lm -lpthread \
-lpopen_noshell \ -lpopen_noshell \
-lfitz -lfreetype -lopenjpeg -ljbig2dec -ljpeg -lz \ -lfitz -lfreetype -lopenjpeg -ljbig2dec -ljpeg -lz \
-lluajit \ -lluajit -ldl \
-ldjvulibre \ -ldjvulibre \
-lcrengine -lchmlib -lpng -lantiword \ -lcrengine -lchmlib -lpng -lantiword \
$(EMU_LDFLAGS) \ $(EMU_LDFLAGS) \
@ -237,10 +237,10 @@ $(CRENGINELIBS):
$(LUALIB): $(LUALIB):
ifdef EMULATE_READER ifdef EMULATE_READER
$(MAKE) -C $(LUADIR) $(MAKE) -C $(LUADIR) BUILDMODE=static
else 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 # 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 endif
$(POPENNSLIB): $(POPENNSLIB):

Loading…
Cancel
Save