mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
[build] Remove DEFAULT
It was redundant with HANDY_TARGETS and HANDY_TARGETS_EXTENSIONS
This commit is contained in:
3
Makefile
3
Makefile
@@ -99,8 +99,7 @@ all_objs = $(call object_for,$(all_src))
|
|||||||
include build/targets.mak
|
include build/targets.mak
|
||||||
|
|
||||||
# Fill in the default recipe
|
# Fill in the default recipe
|
||||||
DEFAULT ?= $(BUILD_DIR)/epsilon.$(EXE)
|
default: $(firstword $(HANDY_TARGETS)).$(firstword $(HANDY_TARGETS_EXTENSIONS))
|
||||||
default: $(DEFAULT)
|
|
||||||
|
|
||||||
# Load standard build rules
|
# Load standard build rules
|
||||||
include build/rules.mk
|
include build/rules.mk
|
||||||
|
|||||||
@@ -2,13 +2,8 @@
|
|||||||
# Those can be built easily by simply invoking "make target.ext". The named file
|
# Those can be built easily by simply invoking "make target.ext". The named file
|
||||||
# will be built in $(BUILD_DIR).
|
# will be built in $(BUILD_DIR).
|
||||||
|
|
||||||
HANDY_TARGETS +=
|
HANDY_TARGETS ?=
|
||||||
HANDY_TARGETS_EXTENSIONS += $(EXE)
|
HANDY_TARGETS_EXTENSIONS ?=
|
||||||
|
|
||||||
define handy_target_rule
|
|
||||||
.PHONY: $(1).$(2)
|
|
||||||
$(1).$(2): $$(BUILD_DIR)/$(1).$(2)
|
|
||||||
endef
|
|
||||||
|
|
||||||
# Epsilon base target
|
# Epsilon base target
|
||||||
|
|
||||||
@@ -74,6 +69,17 @@ HANDY_TARGETS += test
|
|||||||
-include build/targets.$(PLATFORM).mak
|
-include build/targets.$(PLATFORM).mak
|
||||||
|
|
||||||
# Generate handy targets rules
|
# Generate handy targets rules
|
||||||
|
# Define handy targets
|
||||||
|
# Those can be built easily by simply invoking "make target.ext". The named file
|
||||||
|
# will be built in $(BUILD_DIR).
|
||||||
|
|
||||||
|
HANDY_TARGETS_EXTENSIONS += $(EXE)
|
||||||
|
|
||||||
|
define handy_target_rule
|
||||||
|
.PHONY: $(1).$(2)
|
||||||
|
$(1).$(2): $$(BUILD_DIR)/$(1).$(2)
|
||||||
|
endef
|
||||||
|
|
||||||
$(foreach extension,$(HANDY_TARGETS_EXTENSIONS),$(foreach executable,$(HANDY_TARGETS),$(eval $(call handy_target_rule,$(executable),$(extension)))))
|
$(foreach extension,$(HANDY_TARGETS_EXTENSIONS),$(foreach executable,$(HANDY_TARGETS),$(eval $(call handy_target_rule,$(executable),$(extension)))))
|
||||||
|
|
||||||
include build/targets.all.mak
|
include build/targets.all.mak
|
||||||
|
|||||||
@@ -63,6 +63,4 @@ $(BUILD_DIR)/%.apk: $(apk_deps)
|
|||||||
$(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle assembleRelease
|
$(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle assembleRelease
|
||||||
$(Q) cp $(BUILD_DIR)/app/outputs/apk/release/android-release*.apk $@
|
$(Q) cp $(BUILD_DIR)/app/outputs/apk/release/android-release*.apk $@
|
||||||
|
|
||||||
DEFAULT = epsilon.apk
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -89,6 +89,4 @@ simulator_app_deps += $(call simulator_app_resource,launch.storyboardc)
|
|||||||
|
|
||||||
include ion/src/simulator/shared/apple/targets.mak
|
include ion/src/simulator/shared/apple/targets.mak
|
||||||
|
|
||||||
DEFAULT = epsilon.ipa
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -43,6 +43,4 @@ simulator_app_deps += $(call simulator_app_resource,app.icns)
|
|||||||
|
|
||||||
include ion/src/simulator/shared/apple/targets.mak
|
include ion/src/simulator/shared/apple/targets.mak
|
||||||
|
|
||||||
DEFAULT = epsilon.app
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user