Skip to content

Commit

Permalink
Use Wonderful Toolchain's sprint, fix slot 2 adaption
Browse files Browse the repository at this point in the history
  • Loading branch information
NightScript370 committed Nov 21, 2023
1 parent 199f4f8 commit c1d786b
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 560 deletions.
3 changes: 2 additions & 1 deletion .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"name": "Win32",
"includePath": [
"${workspaceFolder}/**",
"C:/msys64/opt/wonderful/thirdparty/blocksds/core/libs/libnds/include/**"
"C:/msys64/opt/wonderful/thirdparty/blocksds/core/libs/libnds/include/**",
"C:/msys64/opt/wonderful/toolchain/gcc-arm-none-eabi/arm-none-eabi/include/**"
],
"defines": [
"__NDS__",
Expand Down
10 changes: 9 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"files.associations": {
"stdint.h": "c"
"stdint.h": "c",
"cstdlib": "c",
"types.h": "c",
"nds.h": "c",
"guitargrip.h": "c",
"boxtest.h": "c",
"background.h": "c",
"video.h": "c",
"sassert.h": "c"
}
}
1 change: 1 addition & 0 deletions arm9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ LDFLAGS := -mthumb -mthumb-interwork $(LIBDIRSFLAGS) \
-Tarm9/ds_arm9_hi.mem \
-T$(BLOCKSDS)/sys/crts/ds_arm9.ld \
-Wl,--no-warn-rwx-segments \
-Wl,--defsym=vfprintf=__i_vfprintf -Wl,--defsym=vfscanf=__i_vfscanf \
-Wl,--start-group $(LIBS) -lgcc -Wl,--end-group

# Intermediate build files
Expand Down
7 changes: 0 additions & 7 deletions arm9/source/Default.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
#include <stdio.h>
#include <stdarg.h>

#ifndef NULL
#define NULL ((void*)0)
#endif

typedef struct _TPoint {
s32 x;
s32 y;
Expand Down Expand Up @@ -40,7 +36,4 @@ static inline bool boundsTest(const TBounds* pBounds, s32 x, s32 y)
#include "EmuSystem.h"
#include "NeoSystem.h"

int neoSprintf (char *str, const char *fmt, ...);
int neoVsnprintf (char *str, size_t count, const char *fmt, va_list args);

#endif
Loading

0 comments on commit c1d786b

Please sign in to comment.