From 2108b6daebb7bcc0ff5c179522d5737e4f9a8ee0 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Wed, 6 Jun 2012 19:41:16 +0800 Subject: [PATCH] fix CC for luajit compilation Conflicts: Makefile --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 094e3c707..22666c5d6 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,7 @@ fetchthirdparty: git submodule init git submodule update ln -sf kpvcrlib/crengine/cr3gui/data data + test -e data/cr3.css || ln kpvcrlib/cr3.css data/ test -d fonts || ln -sf $(TTF_FONTS_DIR) fonts # CREngine patch: disable fontconfig grep USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h && grep -v USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h > /tmp/new && mv /tmp/new $(CRENGINEDIR)/crengine/include/crsetup.h || echo "USE_FONTCONFIG already disabled" @@ -196,8 +197,8 @@ $(LUALIB): ifdef EMULATE_READER make -C $(LUADIR) else + make -C $(LUADIR) CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" CROSS="$(HOST)-" TARGET_FLAGS="$(SYSROOT) -DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2" endif -# make -C lua/src CC="$(CC)" CFLAGS="$(CFLAGS)" MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E" liblua.a thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) $(DJVULIBS) $(CRENGINELIBS)