From fba59fac26e116ceb7ac0246bd87a3a48532fc0f Mon Sep 17 00:00:00 2001 From: fincs Date: Tue, 1 Dec 2015 23:02:20 +0100 Subject: [PATCH] Update Makefiles in preparation for devkitARM r45 --- Makefile | 13 +++++++++---- examples/gputest/Makefile | 4 ++-- examples/immediate/Makefile | 4 ++-- examples/simple_tri/Makefile | 4 ++-- examples/textured_cube/Makefile | 4 ++-- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index c58dbc1..9f2f582 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft CFLAGS := -g -Wall -Werror -O2 -mword-relocations \ -fomit-frame-pointer -ffunction-sections \ @@ -94,10 +94,15 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ #--------------------------------------------------------------------------------- all: $(BUILD) -dist: all - @tar -cjf citro3d-$(VERSION).tar.bz2 include lib +dist-bin: all + @tar --exclude=*~ -cjf citro3d-$(VERSION).tar.bz2 include lib -install: dist +dist-src: + @tar --exclude=*~ -cjf citro3d-src-$(VERSION).tar.bz2 include source Makefile + +dist: dist-src dist-bin + +install: dist-bin mkdir -p $(DEVKITPRO)/libctru bzip2 -cd citro3d-$(VERSION).tar.bz2 | tar -xf - -C $(DEVKITPRO)/libctru diff --git a/examples/gputest/Makefile b/examples/gputest/Makefile index 1c7cc88..70bae14 100644 --- a/examples/gputest/Makefile +++ b/examples/gputest/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=hard -mtp=soft CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ @@ -46,7 +46,7 @@ CFLAGS += $(INCLUDE) -DARM11 -D_3DS CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -Wl,--gc-sections +LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lcitro3d -lctru -lm diff --git a/examples/immediate/Makefile b/examples/immediate/Makefile index d852662..a6103f0 100644 --- a/examples/immediate/Makefile +++ b/examples/immediate/Makefile @@ -37,7 +37,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffunction-sections \ @@ -48,7 +48,7 @@ CFLAGS += $(INCLUDE) -DARM11 -D_3DS CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -Wl,--gc-sections +LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lcitro3d -lctru -lm diff --git a/examples/simple_tri/Makefile b/examples/simple_tri/Makefile index d852662..a6103f0 100644 --- a/examples/simple_tri/Makefile +++ b/examples/simple_tri/Makefile @@ -37,7 +37,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffunction-sections \ @@ -48,7 +48,7 @@ CFLAGS += $(INCLUDE) -DARM11 -D_3DS CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -Wl,--gc-sections +LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lcitro3d -lctru -lm diff --git a/examples/textured_cube/Makefile b/examples/textured_cube/Makefile index d852662..a6103f0 100644 --- a/examples/textured_cube/Makefile +++ b/examples/textured_cube/Makefile @@ -37,7 +37,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffunction-sections \ @@ -48,7 +48,7 @@ CFLAGS += $(INCLUDE) -DARM11 -D_3DS CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -Wl,--gc-sections +LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LIBS := -lcitro3d -lctru -lm