diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-08-03 12:27:12 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | da37ba1822c55de4d3c94b6e206b59b0b023264e (patch) | |
| tree | df42830183bb313781762f79d91286d7969506aa /Makefile | |
| parent | 131cd8a547dcffc81c39568efcd70aa190f16062 (diff) | |
| download | qtlocation-mapboxgl-da37ba1822c55de4d3c94b6e206b59b0b023264e.tar.gz | |
[build] add missing files to Android build
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -425,7 +425,7 @@ build/android-$1/$(BUILDTYPE)/toolchain.cmake: platform/android/scripts/toolchai $(ANDROID_ENV) $1 > build/android-$1/$(BUILDTYPE)/toolchain.cmake build/android-$1/$(BUILDTYPE)/Makefile: build/android-$1/$(BUILDTYPE)/toolchain.cmake platform/android/config.cmake - cd build/android-$1/$(BUILDTYPE) && cmake ../../.. \ + cd build/android-$1/$(BUILDTYPE) && cmake ../../.. -G Ninja \ -DCMAKE_TOOLCHAIN_FILE=build/android-$1/$(BUILDTYPE)/toolchain.cmake \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ @@ -433,7 +433,7 @@ build/android-$1/$(BUILDTYPE)/Makefile: build/android-$1/$(BUILDTYPE)/toolchain. .PHONY: android-lib-$1 android-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile - $(MAKE) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) all + $(NINJA) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) all .PHONY: android-$1 android-$1: android-lib-$1 |