darkkirb/buildtools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only output include directory if building a library, require output zip for all run/install targets.

Browse source
This commit is contained in:
Steven Smith 2016-01-27 20:57:25 -08:00
parent 2b464d8e90
commit 5aba747983
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
make_base
View file

@ -30,7 +30,10 @@ rwildcard=$(wildcard $1/$2) $(foreach d,$(wildcard $1/*),$(call rwildcard,$d,$2)
EMPTY := EMPTY :=
SPACE := $(EMPTY) $(EMPTY) SPACE := $(EMPTY) $(EMPTY)
STRIPPED_NAME := $(subst $(SPACE),,$(NAME)) STRIPPED_NAME := $(subst $(SPACE),,$(NAME))
EXTRA_OUTPUT_FILES += $(INCLUDE_DIRS)
ifeq ($(LIBRARY),1)
EXTRA_OUTPUT_FILES += $(INCLUDE_DIRS)
endif
OBJECT_FILES := $(foreach dir,$(SOURCE_DIRS), \ OBJECT_FILES := $(foreach dir,$(SOURCE_DIRS), \
$(patsubst %.bin,$(BUILD_DIR)/%.bin.o,$(call rwildcard,$(dir),*.bin)) \ $(patsubst %.bin,$(BUILD_DIR)/%.bin.o,$(call rwildcard,$(dir),*.bin)) \
@ -136,27 +139,27 @@ all: $(OUTPUT_ZIP_FILE)
ifeq ($(LIBRARY),1) ifeq ($(LIBRARY),1)
ifeq ($(TARGET),3DS) ifeq ($(TARGET),3DS)
install: $(OUTPUT_ZIP_FILE) install: $(OUTPUT_FILES) $(OUTPUT_ZIP_FILE)
@mkdir -p $(DEVKITPRO)/$(STRIPPED_NAME) @mkdir -p $(DEVKITPRO)/$(STRIPPED_NAME)
@unzip -o $(OUTPUT_ZIP_FILE) -d $(DEVKITPRO)/$(STRIPPED_NAME) > /dev/null @unzip -o $(OUTPUT_ZIP_FILE) -d $(DEVKITPRO)/$(STRIPPED_NAME) > /dev/null
@echo "Installed." @echo "Installed."
else else
install: $(OUTPUT_FILES) install: $(OUTPUT_FILES) $(OUTPUT_ZIP_FILE)
@install -m 0755 $(OUTPUT_FILES) /usr/local/lib @install -m 0755 $(OUTPUT_FILES) /usr/local/lib
@install -m 0755 $(foreach dir,$(INCLUDE_DIRS),$(wildcard $(dir)/*)) /usr/local/include @install -m 0755 $(foreach dir,$(INCLUDE_DIRS),$(wildcard $(dir)/*)) /usr/local/include
@echo "Installed." @echo "Installed."
endif endif
else else
ifeq ($(TARGET),3DS) ifeq ($(TARGET),3DS)
run: $(OUTPUT_FILES) run: $(OUTPUT_FILES) $(OUTPUT_ZIP_FILE)
@echo "Running..." @echo "Running..."
@$(CITRA) $(RUN_FLAGS) $(OUTPUT_DIR)/$(STRIPPED_NAME).elf @$(CITRA) $(RUN_FLAGS) $(OUTPUT_DIR)/$(STRIPPED_NAME).elf
else else
run: $(OUTPUT_FILES) run: $(OUTPUT_FILES) $(OUTPUT_ZIP_FILE)
@echo "Running..." @echo "Running..."
@./$< $(RUN_FLAGS) @./$< $(RUN_FLAGS)
install: $(OUTPUT_FILES) install: $(OUTPUT_FILES) $(OUTPUT_ZIP_FILE)
@install -m 0755 $(OUTPUT_FILES) /usr/local/bin @install -m 0755 $(OUTPUT_FILES) /usr/local/bin
@echo "Installed." @echo "Installed."
endif endif