Skip to content

Commit

Permalink
Allow toggling CRe's new dithering & scaling (#888)
Browse files Browse the repository at this point in the history
Plus, implement said dithering in our own BB code, for ImageWidget

* A "few" buildsystem tweaks:
  * Use a real CMake ToolChain filme when cross-compiling, instead of piling on hacks
  * Export CC/CFLAGS & co to avoid having to daisy-chain those around, and make sure they'll always be honored.
    Actually getting rid of those in Makefile.third is left as an excerise to the reader ;).
    (Or, deferred to the next time a dep is bumped ;)).
  * Fixed distclean in base to actaully clean third party builds.
  * Honor VERBOSE in the env to switch to slightly more verbose builds
  * Fixed MACHINE shenanigans to behave properly, no matter what.
  * Made sure every toolchain was switched to at least C11/C++11
  * Got rid of those annoying hard-coded --silent build flags. Ninja is silent by default.

* Cleaned up jpeg-turbo CMake file
* Bumped LuaSec to 0.8
* Bumped OpenSSL to 1.1.1b
  • Loading branch information
NiLuJe committed Apr 18, 2019
1 parent cdbfa0b commit b6b6d74
Show file tree
Hide file tree
Showing 39 changed files with 933 additions and 254 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -55,3 +55,4 @@ install:
script:
- if [ "$SHELLCHECKS" = 1 ]; then source .ci/lint_script.sh; else source .ci/build_script.sh; fi
- if [ "$EMULATE_READER" = 1 ]; then source .ci/test_script.sh; fi

6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -122,7 +122,7 @@ endif
$(OUTPUT_DIR)/libs/libkoreader-cre.so: cre.cpp \
$(if $(USE_LUAJIT_LIB),$(LUAJIT_LIB),) \
$(CRENGINE_LIB)
$(CXX) -I$(CRENGINE_SRC_DIR)/crengine/include/ $(DYNLIB_CFLAGS) \
$(CXX) -I$(CRENGINE_SRC_DIR)/crengine/include/ $(DYNLIB_CXXFLAGS) \
-DLDOM_USE_OWN_MEM_MAN=$(if $(WIN32),0,1) \
$(if $(WIN32),-DQT_GL=1) -static-libstdc++ -o $@ $^
ifdef DARWIN
Expand Down Expand Up @@ -189,7 +189,7 @@ clean:
-rm -rf $(OUTPUT_DIR)/*
-rm -rf $(THIRDPARTY_DIR)/{$(CMAKE_THIRDPARTY_LIBS)}/build/$(MACHINE)

dist-clean:
distclean:
-rm -rf build
-rm -rf $(THIRDPARTY_DIR)/{$(CMAKE_THIRDPARTY_LIBS)}/build

Expand All @@ -212,4 +212,4 @@ test: $(OUTPUT_DIR)/spec $(OUTPUT_DIR)/.busted
--no-auto-insulate \
-o ./spec/base/unit/verbose_print ./spec/base/unit

.PHONY: all clean test
.PHONY: all android-toolchain pocketbook-toolchain clean distclean test

0 comments on commit b6b6d74

Please sign in to comment.