]> Chaos Git - corbenik/ctrulib.git/commitdiff
projects / corbenik / ctrulib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1aae1b2)
Revert "Update example makefiles"
authorDave Murphy <davem@devkitpro.org>
Fri, 5 Dec 2014 13:47:57 +0000 (13:47 +0000)
committerDave Murphy <davem@devkitpro.org>
Fri, 5 Dec 2014 13:47:57 +0000 (13:47 +0000)
This reverts commit 0f93112ecb43ae145c7e5e353e1e378de31c4a33.

examples/app_launch/Makefile patch | blob | history
examples/gpu/Makefile patch | blob | history
examples/http/Makefile patch | blob | history
examples/libapplet_launch/Makefile patch | blob | history
examples/mic/Makefile patch | blob | history
examples/mvd/Makefile patch | blob | history
examples/sdmc/Makefile patch | blob | history

diff --git a/examples/app_launch/Makefile b/examples/app_launch/Makefile
index 576126e71a9aeba1960cff6ae50a12d93767a509..c4c758ea3af42dd7efb4854ae74447f04a5370cc 100644 (file)
--- 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 576126e71a9aeba1960cff6ae50a12d93767a509..c4c758ea3af42dd7efb4854ae74447f04a5370cc 100644 (file)
--- 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 576126e71a9aeba1960cff6ae50a12d93767a509..c4c758ea3af42dd7efb4854ae74447f04a5370cc 100644 (file)
--- 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 576126e71a9aeba1960cff6ae50a12d93767a509..c4c758ea3af42dd7efb4854ae74447f04a5370cc 100644 (file)
--- 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 576126e71a9aeba1960cff6ae50a12d93767a509..c4c758ea3af42dd7efb4854ae74447f04a5370cc 100644 (file)
--- 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 576126e71a9aeba1960cff6ae50a12d93767a509..c4c758ea3af42dd7efb4854ae74447f04a5370cc 100644 (file)
--- 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 576126e71a9aeba1960cff6ae50a12d93767a509..c4c758ea3af42dd7efb4854ae74447f04a5370cc 100644 (file)
--- 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)
 
 #---------------------------------------------------------------------------------
C library for writing user mode arm11 code for the 3DS (CTR)