Skip to content

Commit

Permalink
Bump base for trying more SDL2 library names (koreader#4829)
Browse files Browse the repository at this point in the history 
See koreader#4826 (comment)

Also some Makefile/CMake sanity/cleanup/style/refactoring.

Includes:

* [build] Move Android ZLIB_LDFLAGS to thirdparty/zlib koreader/koreader-base#870
* [chore] Update CMake to modern style with lowercase commands koreader/koreader-base#872
* [fix] Add util.ffiLoadCandidates to try multiple SDL2 library names koreader/koreader-base#873
* [fix] Return fail status for SDL koreader/koreader-base#874
* [chore] Makefile: declare all phonies koreader/koreader-base#875
* [chore] Remove luajit-clean target koreader/koreader-base#876
* [chore] CMake kpvcrlib convert remaining tabs to four spaces koreader/koreader-base#877
  • Loading branch information
@Frenzie @mwoz123
Frenzie authored and mwoz123 committed Mar 29, 2020
1 parent f39d495 commit 9cd6c83
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion base
Submodule base updated 48 files
+1 −4 Makefile
+0 −1 Makefile.defs
+0 −9 Makefile.third
+5 −1 ffi/SDL2_0.lua
+22 −1 ffi/util.lua
+4 −4 thirdparty/cmake_modules/koreader_thirdparty_asm.cmake
+4 −4 thirdparty/cmake_modules/koreader_thirdparty_common.cmake
+2 −2 thirdparty/czmq/CMakeLists.txt
+2 −2 thirdparty/djvulibre/CMakeLists.txt
+2 −2 thirdparty/dropbear/CMakeLists.txt
+2 −2 thirdparty/evernote-sdk-lua/CMakeLists.txt
+2 −2 thirdparty/fbink/CMakeLists.txt
+2 −2 thirdparty/filemq/CMakeLists.txt
+2 −2 thirdparty/freetype2/CMakeLists.txt
+2 −2 thirdparty/gettext/CMakeLists.txt
+2 −2 thirdparty/giflib/CMakeLists.txt
+2 −2 thirdparty/glib/CMakeLists.txt
+3 −3 thirdparty/harfbuzz/CMakeLists.txt
+88 −88 thirdparty/kpvcrlib/CMakeLists.txt
+2 −2 thirdparty/leptonica/CMakeLists.txt
+2 −2 thirdparty/libffi/CMakeLists.txt
+2 −2 thirdparty/libiconv/CMakeLists.txt
+9 −9 thirdparty/libjpeg-turbo/CMakeLists.txt
+2 −2 thirdparty/libk2pdfopt/CMakeLists.txt
+2 −2 thirdparty/libpng/CMakeLists.txt
+3 −3 thirdparty/libzmq/CMakeLists.txt
+2 −2 thirdparty/lj-wpaclient/CMakeLists.txt
+2 −2 thirdparty/lodepng/CMakeLists.txt
+2 −2 thirdparty/lpeg/CMakeLists.txt
+2 −2 thirdparty/lua-Spore/CMakeLists.txt
+2 −2 thirdparty/lua-serialize/CMakeLists.txt
+2 −2 thirdparty/luajit/CMakeLists.txt
+2 −2 thirdparty/luasec/CMakeLists.txt
+2 −2 thirdparty/luasocket/CMakeLists.txt
+2 −2 thirdparty/minizip/CMakeLists.txt
+3 −3 thirdparty/mupdf/CMakeLists.txt
+2 −2 thirdparty/nanosvg/CMakeLists.txt
+2 −2 thirdparty/openssh/CMakeLists.txt
+2 −2 thirdparty/openssl/CMakeLists.txt
+3 −3 thirdparty/popen-noshell/CMakeLists.txt
+2 −2 thirdparty/sdcv/CMakeLists.txt
+2 −2 thirdparty/sqlite/CMakeLists.txt
+4 −4 thirdparty/tar/CMakeLists.txt
+2 −2 thirdparty/tesseract/CMakeLists.txt
+2 −2 thirdparty/turbo/CMakeLists.txt
+17 −5 thirdparty/zlib/CMakeLists.txt
+2 −2 thirdparty/zsync/CMakeLists.txt
+2 −2 thirdparty/zyre/CMakeLists.txt

0 comments on commit 9cd6c83

Please sign in to comment.