diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-23 19:25:50 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-23 20:29:14 -0700 |
| commit | d5840beb4719caab9e1e890796992182fa03bfae (patch) | |
| tree | f7c5b5597436b10cfdb5e9222ef8fe882503c4fe /scripts | |
| parent | b611a6f5dc1e4d292eeb18e8be61b3fe327ab1e5 (diff) | |
| download | qtlocation-mapboxgl-d5840beb4719caab9e1e890796992182fa03bfae.tar.gz | |
[build] Inline main.mk linux and qt targets into Makefile
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/main.mk | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/scripts/main.mk b/scripts/main.mk index dd05e633ab..7f1f02011c 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -15,15 +15,6 @@ ifeq ($(PLATFORM),android) GYP_FLAVOR_SUFFIX = -android ENV = $(shell MASON_ANDROID_ABI=$(CONFIGURE_SUBPLATFORM) ./platform/android/scripts/toolchain.sh) -else ifeq ($(PLATFORM),qt) - CONFIGURE_PLATFORM = $(HOST_PLATFORM) - CONFIGURE_SUBPLATFORM = $(shell uname -m) - CONFIGURE_INPUT = platform/qt/scripts/configure.sh - PLATFORM_OUTPUT = ./build/qt-$(HOST_PLATFORM)-$(CONFIGURE_SUBPLATFORM) - - # Cross compilation support - ENV = $(shell MASON_PLATFORM_VERSION=$(CONFIGURE_SUBPLATFORM) ./platform/qt/scripts/toolchain.sh) - else CONFIGURE_PLATFORM = $(PLATFORM) CONFIGURE_SUBPLATFORM = $(shell uname -m) @@ -70,55 +61,6 @@ Makefile/__project__: $(CONFIGURE_OUTPUT) @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n" $(ENV) deps/run_gyp platform/$(PLATFORM)/platform.gyp $(GYP_FLAGS) -f make$(GYP_FLAVOR_SUFFIX) -.PHONY: Ninja/__project__ -Ninja/__project__: $(CONFIGURE_OUTPUT) - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n" - $(ENV) deps/run_gyp platform/$(PLATFORM)/platform.gyp $(GYP_FLAGS) -f ninja - -#### Build individual targets ################################################## - Makefile/%: Makefile/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" $(ENV) $(MAKE) -j$(JOBS) -C $(PLATFORM_OUTPUT) BUILDTYPE=$(BUILDTYPE) $* - -Ninja/%: Ninja/__project__ - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" - $(ENV) deps/ninja/ninja-$(PLATFORM) -C $(PLATFORM_OUTPUT)/$(BUILDTYPE) $* - -#### Tidy ###################################################################### - -Ninja/compdb: OUTPUT=$(PLATFORM_OUTPUT)/$(BUILDTYPE)/compile_commands.json -Ninja/compdb: Ninja/__project__ - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Writing to $(OUTPUT)$(FORMAT_END)\n" - $(ENV) deps/ninja/ninja-$(PLATFORM) -C $(PLATFORM_OUTPUT)/$(BUILDTYPE) \ - -t compdb cc cc_s cxx objc objcxx > $(OUTPUT) - -tidy: Ninja/compdb - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Generating header files...$(FORMAT_END)\n" - $(ENV) deps/ninja/ninja-$(PLATFORM) -C $(PLATFORM_OUTPUT)/$(BUILDTYPE) version shaders - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Running tidy...$(FORMAT_END)\n" - @./scripts/clang-tidy.sh $(PLATFORM_OUTPUT)/$(BUILDTYPE) - -#### Run tests ################################################################# - -run-glfw-app: - cd $(PLATFORM_OUTPUT)/$(BUILDTYPE) && ./mapbox-glfw - -run-qt-app: - cd $(PLATFORM_OUTPUT)/$(BUILDTYPE) && ./qmapboxgl - -run-qt-qml-app: - cd $(PLATFORM_OUTPUT)/$(BUILDTYPE) && ./qquickmapboxgl - -run-valgrind-glfw-app: - cd $(PLATFORM_OUTPUT)/$(BUILDTYPE) && valgrind --leak-check=full --suppressions=../../../scripts/valgrind.sup ./mapbox-glfw - -ifneq (,$(shell which gdb)) - GDB = gdb -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args -endif - -test-%: Makefile/test - $(GDB) $(PLATFORM_OUTPUT)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=$* - -check: Makefile/test - ./scripts/collect-coverage.sh $(PLATFORM_OUTPUT)/$(BUILDTYPE) |