Switched LuaJIT to shared library instead of static

pull/2/merge
HW 12 years ago committed by Qingping Hou
parent 15d6f7e851
commit f073c23296

@ -109,7 +109,8 @@ THIRDPARTYLIBS := $(MUPDFLIBDIR)/libfreetype.a \
#$(MUPDFLIBDIR)/libjpeg.a \ #$(MUPDFLIBDIR)/libjpeg.a \
#$(CRENGINEDIR)/thirdparty/libjpeg/libjpeg.a \ #$(CRENGINEDIR)/thirdparty/libjpeg/libjpeg.a \
LUALIB := $(LUADIR)/src/libluajit.a #LUALIB := $(LUADIR)/src/libluajit.a
LUALIB := $(LIBDIR)/libluajit-5.1.so.2
POPENNSLIB := $(POPENNSDIR)/libpopen_noshell.a POPENNSLIB := $(POPENNSDIR)/libpopen_noshell.a
@ -143,7 +144,7 @@ kpdfview: kpdfview.o einkfb.o pdf.o k2pdfopt.o blitbuffer.o drawcontext.o input.
$(STATICLIBSTDCPP) \ $(STATICLIBSTDCPP) \
$(LDFLAGS) \ $(LDFLAGS) \
-o $@ \ -o $@ \
-lm -ldl -lpthread -ldjvulibre -ljpeg -L$(MUPDFLIBDIR) -L$(LIBDIR)\ -lm -ldl -lpthread -ldjvulibre -ljpeg -lluajit -L$(MUPDFLIBDIR) -L$(LIBDIR)\
$(EMU_LDFLAGS) \ $(EMU_LDFLAGS) \
$(DYNAMICLIBSTDCPP) $(DYNAMICLIBSTDCPP)
@ -264,11 +265,13 @@ $(CRENGINELIBS):
$(LUALIB): $(LUALIB):
ifdef EMULATE_READER ifdef EMULATE_READER
$(MAKE) -C $(LUADIR) BUILDMODE=static $(MAKE) -C $(LUADIR) BUILDMODE=shared
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) 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" $(MAKE) -C $(LUADIR) BUILDMODE=shared 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
test -d $(LIBDIR) || mkdir $(LIBDIR)
cp -a $(LUADIR)/src/libluajit.so $(LUALIB)
$(POPENNSLIB): $(POPENNSLIB):
$(MAKE) -C $(POPENNSDIR) CC="$(CC)" AR="$(AR)" $(MAKE) -C $(POPENNSDIR) CC="$(CC)" AR="$(AR)"
@ -290,6 +293,7 @@ customupdate: all
cp -p README.md COPYING kpdfview extr kpdf.sh $(LUA_FILES) $(INSTALL_DIR) cp -p README.md COPYING kpdfview extr kpdf.sh $(LUA_FILES) $(INSTALL_DIR)
mkdir $(INSTALL_DIR)/data mkdir $(INSTALL_DIR)/data
cp -L libs/libdjvulibre.so.21 $(INSTALL_DIR)/libs cp -L libs/libdjvulibre.so.21 $(INSTALL_DIR)/libs
cp -L $(LUALIB) $(INSTALL_DIR)/libs
$(STRIP) --strip-unneeded $(INSTALL_DIR)/libs/* $(STRIP) --strip-unneeded $(INSTALL_DIR)/libs/*
cp -rpL data/*.css $(INSTALL_DIR)/data cp -rpL data/*.css $(INSTALL_DIR)/data
cp -rpL fonts $(INSTALL_DIR) cp -rpL fonts $(INSTALL_DIR)

Loading…
Cancel
Save