From 4caa875489ad9cdc01a578a009b7ab5bd67b5d92 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sun, 1 Mar 2015 16:56:10 +0000 Subject: [PATCH] fix smdh building --- examples/gpu/Makefile | 7 ++++--- examples/graphics/printing/hello-world/Makefile | 6 +++--- examples/http/Makefile | 6 +++--- examples/input/read-controls/Makefile | 6 +++--- examples/input/touch-screen/Makefile | 6 +++--- examples/libapplet_launch/Makefile | 6 +++--- examples/mvd/Makefile | 6 +++--- examples/sdmc/Makefile | 6 +++--- 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/examples/gpu/Makefile b/examples/gpu/Makefile index bdda1a3..ee6b6e4 100644 --- a/examples/gpu/Makefile +++ b/examples/gpu/Makefile @@ -141,10 +141,11 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif + $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/graphics/printing/hello-world/Makefile b/examples/graphics/printing/hello-world/Makefile index 542abb4..e881aac 100755 --- a/examples/graphics/printing/hello-world/Makefile +++ b/examples/graphics/printing/hello-world/Makefile @@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/http/Makefile b/examples/http/Makefile index 542abb4..e881aac 100644 --- a/examples/http/Makefile +++ b/examples/http/Makefile @@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/input/read-controls/Makefile b/examples/input/read-controls/Makefile index b277846..d75f548 100755 --- a/examples/input/read-controls/Makefile +++ b/examples/input/read-controls/Makefile @@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/input/touch-screen/Makefile b/examples/input/touch-screen/Makefile index 542abb4..e881aac 100755 --- a/examples/input/touch-screen/Makefile +++ b/examples/input/touch-screen/Makefile @@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/libapplet_launch/Makefile b/examples/libapplet_launch/Makefile index 542abb4..e881aac 100644 --- a/examples/libapplet_launch/Makefile +++ b/examples/libapplet_launch/Makefile @@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/mvd/Makefile b/examples/mvd/Makefile index 542abb4..e881aac 100644 --- a/examples/mvd/Makefile +++ b/examples/mvd/Makefile @@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/sdmc/Makefile b/examples/sdmc/Makefile index 542abb4..e881aac 100644 --- a/examples/sdmc/Makefile +++ b/examples/sdmc/Makefile @@ -141,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -.PHONY: all -all : $(OUTPUT).3dsx $(OUTPUT).smdh -endif +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else $(OUTPUT).3dsx : $(OUTPUT).elf +endif $(OUTPUT).elf : $(OFILES) #---------------------------------------------------------------------------------