From 2d25b0359f4a33e2e6825f0fed49524ed8cc4d1f Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Fri, 5 Dec 2014 13:47:57 +0000 Subject: [PATCH] Revert "Update example makefiles" This reverts commit 0f93112ecb43ae145c7e5e353e1e378de31c4a33. --- examples/app_launch/Makefile | 13 ++++--------- examples/gpu/Makefile | 13 ++++--------- examples/http/Makefile | 13 ++++--------- examples/libapplet_launch/Makefile | 13 ++++--------- examples/mic/Makefile | 13 ++++--------- examples/mvd/Makefile | 13 ++++--------- examples/sdmc/Makefile | 13 ++++--------- 7 files changed, 28 insertions(+), 63 deletions(-) diff --git a/examples/app_launch/Makefile b/examples/app_launch/Makefile index 576126e..c4c758e 100644 --- a/examples/app_launch/Makefile +++ b/examples/app_launch/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -113,10 +113,6 @@ else export APP_ICON := $(TOPDIR)/$(ICON) endif -ifeq ($(strip $(NO_SMDH)),) - export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh -endif - .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -141,11 +137,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh -else -$(OUTPUT).3dsx : $(OUTPUT).elf +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh endif - +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/gpu/Makefile b/examples/gpu/Makefile index 576126e..c4c758e 100644 --- a/examples/gpu/Makefile +++ b/examples/gpu/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -113,10 +113,6 @@ else export APP_ICON := $(TOPDIR)/$(ICON) endif -ifeq ($(strip $(NO_SMDH)),) - export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh -endif - .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -141,11 +137,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh -else -$(OUTPUT).3dsx : $(OUTPUT).elf +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh endif - +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/http/Makefile b/examples/http/Makefile index 576126e..c4c758e 100644 --- a/examples/http/Makefile +++ b/examples/http/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -113,10 +113,6 @@ else export APP_ICON := $(TOPDIR)/$(ICON) endif -ifeq ($(strip $(NO_SMDH)),) - export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh -endif - .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -141,11 +137,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh -else -$(OUTPUT).3dsx : $(OUTPUT).elf +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh endif - +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/libapplet_launch/Makefile b/examples/libapplet_launch/Makefile index 576126e..c4c758e 100644 --- a/examples/libapplet_launch/Makefile +++ b/examples/libapplet_launch/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -113,10 +113,6 @@ else export APP_ICON := $(TOPDIR)/$(ICON) endif -ifeq ($(strip $(NO_SMDH)),) - export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh -endif - .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -141,11 +137,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh -else -$(OUTPUT).3dsx : $(OUTPUT).elf +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh endif - +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/mic/Makefile b/examples/mic/Makefile index 576126e..c4c758e 100644 --- a/examples/mic/Makefile +++ b/examples/mic/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -113,10 +113,6 @@ else export APP_ICON := $(TOPDIR)/$(ICON) endif -ifeq ($(strip $(NO_SMDH)),) - export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh -endif - .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -141,11 +137,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh -else -$(OUTPUT).3dsx : $(OUTPUT).elf +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh endif - +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/mvd/Makefile b/examples/mvd/Makefile index 576126e..c4c758e 100644 --- a/examples/mvd/Makefile +++ b/examples/mvd/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -113,10 +113,6 @@ else export APP_ICON := $(TOPDIR)/$(ICON) endif -ifeq ($(strip $(NO_SMDH)),) - export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh -endif - .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -141,11 +137,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh -else -$(OUTPUT).3dsx : $(OUTPUT).elf +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh endif - +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- diff --git a/examples/sdmc/Makefile b/examples/sdmc/Makefile index 576126e..c4c758e 100644 --- a/examples/sdmc/Makefile +++ b/examples/sdmc/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -113,10 +113,6 @@ else export APP_ICON := $(TOPDIR)/$(ICON) endif -ifeq ($(strip $(NO_SMDH)),) - export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh -endif - .PHONY: $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -141,11 +137,10 @@ DEPENDS := $(OFILES:.o=.d) # main targets #--------------------------------------------------------------------------------- ifeq ($(strip $(NO_SMDH)),) -$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh -else -$(OUTPUT).3dsx : $(OUTPUT).elf +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh endif - +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).elf : $(OFILES) #---------------------------------------------------------------------------------