Merge branch 'master' into gpu_revamp

This commit is contained in:
Dave Murphy 2015-03-01 16:56:34 +00:00
commit 11cd337d36
8 changed files with 25 additions and 24 deletions

View File

@ -141,10 +141,11 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------