Skip to content

Commit

Permalink
Minor cblitbuffer tweaks (#713)
Browse files Browse the repository at this point in the history
* Fix cblit's div255 (there was an extra + 1 in there)
* Fix a few GCC warnings
* We're in C, we can do case switches :)
  They can't be worse that if/else ladders, at least.
  Just need to enforce block scope, because scope is switch wide otherwise.

* Make SQLite slightly leaner & meaner

* Propagate LDFLAGS in a few 3rd party libs that failed to
  • Loading branch information
NiLuJe committed Jul 27, 2018
1 parent 7ab1e3b commit 675ec21
Show file tree
Hide file tree
Showing 7 changed files with 828 additions and 631 deletions.
7 changes: 6 additions & 1 deletion Makefile.third
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ $(LODEPNG_LIB) $(LODEPNG_DIR): $(THIRDPARTY_DIR)/lodepng/CMakeLists.txt
install -d $(LODEPNG_BUILD_DIR)
-rm -f $(LODEPNG_DIR)/../lodepng-stamp/lodepng-build
cd $(LODEPNG_BUILD_DIR) && \
$(CMAKE) -DCC="$(CC)" -DCFLAGS="$(CFLAGS)" \
$(CMAKE) -DCC="$(CC)" -DCFLAGS="$(CFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
-DSONAME="$(notdir $(LODEPNG_LIB))" \
-DOUTPUT_PATH="$(CURDIR)/$(dir $(LODEPNG_LIB))" \
$(CURDIR)/$(THIRDPARTY_DIR)/lodepng && \
Expand Down Expand Up @@ -165,6 +165,7 @@ $(POPEN_NOSHELL_LIB): $(THIRDPARTY_DIR)/popen-noshell/CMakeLists.txt
$(CMAKE) $(if $(LEGACY),-DLEGACY:BOOL=ON,) \
-DCC="$(CC)" -DAR="$(AR)" \
-DCFLAGS="$(CFLAGS) $(if $(ANDROID),--sysroot=$(SYSROOT),)" \
-DLDFLAGS="$(LDFLAGS)" \
$(CURDIR)/$(THIRDPARTY_DIR)/popen-noshell && \
$(MAKE)

Expand Down Expand Up @@ -370,6 +371,7 @@ $(OUTPUT_DIR)/tar: $(THIRDPARTY_DIR)/tar/CMakeLists.txt
cd $(TAR_BUILD_DIR) && \
$(CMAKE) -DCC="$(CC)" \
-DCFLAGS="$(CFLAGS)" \
-DLDFLAGS="$(LDFLAGS)" \
-DLIBS="$(if $(or $(ANDROID),$(WIN32),$(DARWIN)),,-lrt) $(if $(ANDROID),-static,)" \
$(if $(LEGACY),-DDISABLE_LARGEFILE:BOOL=ON -DDISABLE_FORTIFY:BOOL=ON,) \
-DCHOST="$(if $(EMULATE_READER),,$(CHOST))" \
Expand All @@ -389,6 +391,7 @@ $(OUTPUT_DIR)/zsync: $(THIRDPARTY_DIR)/zsync/CMakeLists.txt
cd $(ZSYNC_BUILD_DIR) && \
$(CMAKE) -DHOST="$(if $(EMULATE_READER),,$(CHOST))" -DCC="$(CC)" \
-DCFLAGS="$(CFLAGS)" \
-DLDFLAGS="$(LDFLAGS)" \
-DLIBS="$(if $(ANDROID),-static,)" \
$(CURDIR)/$(THIRDPARTY_DIR)/zsync && \
$(MAKE)
Expand Down Expand Up @@ -608,7 +611,9 @@ $(SQLITE_LIB): $(THIRDPARTY_DIR)/sqlite/CMakeLists.txt
cd $(SQLITE_BUILD_DIR) && \
$(CMAKE) -DCHOST="$(CHOST)" \
-DCC="$(CC)" \
-DCPPFLAGS="$(CPPFLAGS)" \
-DCFLAGS="$(CFLAGS)" \
-DLDFLAGS="$(LDFLAGS)" \
$(CURDIR)/thirdparty/sqlite && \
$(MAKE)
cp $(SQLITE_DIR)/lib/$(notdir $(SQLITE_LIB)) $(OUTPUT_DIR)/libs
Expand Down

0 comments on commit 675ec21

Please sign in to comment.