]> 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: 2d072ab)
Update example makefiles
authorfincs <fincs.alt1@gmail.com>
Wed, 3 Dec 2014 20:25:32 +0000 (21:25 +0100)
committerfincs <fincs.alt1@gmail.com>
Fri, 5 Dec 2014 13:13:17 +0000 (14:13 +0100)
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 c4c758ea3af42dd7efb4854ae74447f04a5370cc..576126e71a9aeba1960cff6ae50a12d93767a509 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=softfp
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS :=      -g -Wall -O2 -mword-relocations \
                        -fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
        export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,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/gpu/Makefile b/examples/gpu/Makefile
index c4c758ea3af42dd7efb4854ae74447f04a5370cc..576126e71a9aeba1960cff6ae50a12d93767a509 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=softfp
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS :=      -g -Wall -O2 -mword-relocations \
                        -fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
        export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,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/http/Makefile b/examples/http/Makefile
index c4c758ea3af42dd7efb4854ae74447f04a5370cc..576126e71a9aeba1960cff6ae50a12d93767a509 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=softfp
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS :=      -g -Wall -O2 -mword-relocations \
                        -fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
        export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,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/libapplet_launch/Makefile b/examples/libapplet_launch/Makefile
index c4c758ea3af42dd7efb4854ae74447f04a5370cc..576126e71a9aeba1960cff6ae50a12d93767a509 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=softfp
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS :=      -g -Wall -O2 -mword-relocations \
                        -fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
        export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,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/mic/Makefile b/examples/mic/Makefile
index c4c758ea3af42dd7efb4854ae74447f04a5370cc..576126e71a9aeba1960cff6ae50a12d93767a509 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=softfp
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS :=      -g -Wall -O2 -mword-relocations \
                        -fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
        export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,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/mvd/Makefile b/examples/mvd/Makefile
index c4c758ea3af42dd7efb4854ae74447f04a5370cc..576126e71a9aeba1960cff6ae50a12d93767a509 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=softfp
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS :=      -g -Wall -O2 -mword-relocations \
                        -fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
        export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,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/sdmc/Makefile b/examples/sdmc/Makefile
index c4c758ea3af42dd7efb4854ae74447f04a5370cc..576126e71a9aeba1960cff6ae50a12d93767a509 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=softfp
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS :=      -g -Wall -O2 -mword-relocations \
                        -fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
        export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,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)
 
 #---------------------------------------------------------------------------------
C library for writing user mode arm11 code for the 3DS (CTR)