Skip to content

Commit

Permalink
build: fix all target
Browse files Browse the repository at this point in the history
  • Loading branch information
houqp committed Feb 4, 2016
1 parent d3bdb23 commit fe0a527
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -54,7 +54,8 @@ install:
- export PATH=$PATH:$HOME/.luarocks/bin

script:
- make fetchthirdparty all
- travis_retry make fetchthirdparty
- make all
- cp build/*/luajit $HOME/.luarocks/bin
# install tesseract trained language data for testing OCR functionality
- wget https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.eng.tar.gz
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Expand Up @@ -41,7 +41,7 @@ endif
cd $(EVERNOTE_SDK_DIR) && \
cp -r *.lua evernote $(CURDIR)/$(EVERNOTE_PLUGIN_DIR) && \
cp thrift/*.lua $(CURDIR)/$(EVERNOTE_THRIFT_DIR)
test -e $(LPEG_RE) && chmod 664 $(LPEG_RE) # hot fix re.lua permission
test -e $(LPEG_RE) && chmod 664 $(LPEG_RE) || true # hot fix re.lua permission

$(OUTPUT_DIR)/libs:
install -d $(OUTPUT_DIR)/libs
Expand Down Expand Up @@ -101,7 +101,10 @@ $(OUTPUT_DIR)/libs/libwrap-mupdf.so: wrap-mupdf.c \
-o $@ $^

ffi/mupdf_h.lua: ffi-cdecl/mupdf_decl.c $(MUPDF_DIR)/include
CPPFLAGS="$(CFLAGS) -I. -I$(MUPDF_DIR)/include" $(FFI-CDECL) gcc ffi-cdecl/mupdf_decl.c ffi/mupdf_h.lua
CPPFLAGS="$(CFLAGS) -I. -I$(MUPDF_DIR)/include" $(FFI_CDECL) gcc ffi-cdecl/mupdf_decl.c $@

ffi/SDL2_0_h.lua: ffi-cdecl/SDL2_0_decl.c
CPPFLAGS="$(CFLAGS) -I. -LSDL2" $(FFI_CDECL) gcc ffi-cdecl/SDL2_0_decl.c $@

# include all third party libs
include third.Makefile
Expand Down

0 comments on commit fe0a527

Please sign in to comment.