Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Commit

Permalink
Merge pull request #3 from cloudburst/fix_bats
Browse files Browse the repository at this point in the history
Fix compilation on linux
  • Loading branch information
d0k3 committed Jan 14, 2016
2 parents 36ea06f + c74a5f3 commit 7c7b26c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
14 changes: 11 additions & 3 deletions Makefile
Expand Up @@ -30,6 +30,7 @@ TARGET := $(notdir $(CURDIR))
BUILD := build
SOURCES := source source/libkhax
DATA := data
PAYLOAD := arm9payload
INCLUDES := include
APP_TITLE := miniPasta
APP_DESCRIPTION := Simple, safe, no-firmlaunch Pasta
Expand Down Expand Up @@ -78,7 +79,7 @@ export DEPSDIR := $(CURDIR)/$(BUILD)
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) $(PAYLOAD).bin

#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
Expand Down Expand Up @@ -116,10 +117,15 @@ else
export APP_ICON := $(TOPDIR)/$(ICON)
endif

.PHONY: $(BUILD) clean all
.PHONY: $(PAYLOAD) $(BUILD) clean all

#---------------------------------------------------------------------------------
all: $(BUILD)
all: $(PAYLOAD).bin $(BUILD)

$(PAYLOAD).bin:
@make --no-print-directory -C $(PAYLOAD) -f $(CURDIR)/$(PAYLOAD)/Makefile
@[ -d $(DATA) ] || mkdir -p $(DATA)
@cp $(PAYLOAD)/$(PAYLOAD).bin $(DATA)

$(BUILD):
@echo $(SFILES)
Expand All @@ -130,6 +136,8 @@ $(BUILD):
clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf
@rm -fr $(DATA)
@$(MAKE) --no-print-directory -C $(PAYLOAD) clean


#---------------------------------------------------------------------------------
Expand Down
7 changes: 0 additions & 7 deletions build.bat

This file was deleted.

5 changes: 0 additions & 5 deletions clean.bat

This file was deleted.

0 comments on commit 7c7b26c

Please sign in to comment.