Skip to content

Commit

Permalink
treewide: update project to BlocksDS v0.14.0
Browse files Browse the repository at this point in the history
- Updated Makefiles
- fatfs.h -> fat.h
  • Loading branch information
lifehackerhansol committed Mar 11, 2024
1 parent 7fe78fe commit 56080f0
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile.arm7
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ ASFLAGS += -x assembler-with-cpp $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CFLAGS += -std=gnu11 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CXXFLAGS += -std=gnu++14 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CXXFLAGS += -std=gnu++17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-fno-exceptions -fno-rtti \
-specs=$(SPECS)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.arm9
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ ASFLAGS += -x assembler-with-cpp $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CFLAGS += -std=gnu11 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CXXFLAGS += -std=gnu++14 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CXXFLAGS += -std=gnu++17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-fno-exceptions -fno-rtti \
-specs=$(SPECS)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.arm9_crt0set
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ ASFLAGS += -x assembler-with-cpp $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CFLAGS += -std=gnu11 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CXXFLAGS += -std=gnu++14 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CXXFLAGS += -std=gnu++17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-fno-exceptions -fno-rtti \
-specs=$(SPECS)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.arm9_r4ids
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ ASFLAGS += -x assembler-with-cpp $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CFLAGS += -std=gnu11 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CXXFLAGS += -std=gnu++14 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CXXFLAGS += -std=gnu++17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-fno-exceptions -fno-rtti \
-specs=$(SPECS)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.arm9_r4isdhc
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ ASFLAGS += -x assembler-with-cpp $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CFLAGS += -std=gnu11 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-specs=$(SPECS)

CXXFLAGS += -std=gnu++14 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
CXXFLAGS += -std=gnu++17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \
$(ARCH) -Os -ffunction-sections -fdata-sections \
-fno-exceptions -fno-rtti \
-specs=$(SPECS)
Expand Down
2 changes: 1 addition & 1 deletion arm9/source/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <nds.h>
#include <nds/arm9/dldi.h>
#include <fatfs.h>
#include <fat.h>

#include <stdio.h>

Expand Down
2 changes: 1 addition & 1 deletion arm9/source/nds_loader_arm9.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <limits.h>

#include <unistd.h>
#include <fatfs.h>
#include <fat.h>

#include "load_bin.h"

Expand Down
2 changes: 1 addition & 1 deletion bootloader
Submodule bootloader updated 1 files
+2 −2 Makefile

0 comments on commit 56080f0

Please sign in to comment.