From e97cfb91e79480bb9b735bfdef4e16d6dda0f3e1 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 29 Mar 2012 00:20:07 +0200 Subject: [PATCH] hack crsetup.h using grep #77 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 369b1e09e..264c26eb9 100644 --- a/Makefile +++ b/Makefile @@ -113,10 +113,12 @@ lfs.o: $(LFSDIR)/src/lfs.c $(CC) -c $(CFLAGS) -I$(LUADIR)/src -I$(LFSDIR)/src $(LFSDIR)/src/lfs.c -o $@ fetchthirdparty: - -rm -Rf lua lua-5.1.4* + -rm -Rf lua lua-5.1.4 -rm -Rf mupdf/thirdparty git submodule init git submodule update + 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 + test -f $(CRENGINEDIR)/thirdparty/zlib/qconfig.h || touch $(CRENGINEDIR)/thirdparty/zlib/qconfig.h test -f mupdf-thirdparty.zip || wget http://www.mupdf.com/download/mupdf-thirdparty.zip unzip mupdf-thirdparty.zip -d mupdf test -f lua-5.1.4.tar.gz || wget http://www.lua.org/ftp/lua-5.1.4.tar.gz @@ -164,7 +166,6 @@ $(CRENGINELIBS): cd $(CRENGINEDIR)/thirdparty/libpng && make cd $(CRENGINEDIR)/thirdparty/zlib && make cd $(CRENGINEDIR)/crengine && make - 'cp' -ru $(CRENGINELIBS)/cr3gui/data ./ $(LUALIB): make -C lua/src CC="$(CC)" CFLAGS="$(CFLAGS)" MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E" liblua.a