DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use __3DS__ instead of _3DS

Browse Source
This commit is contained in:
fincs 2021-08-07 19:12:47 +02:00
parent 1f4669fa4c
commit 48967dc417
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libctru/Makefile
View File

@ -50,7 +50,7 @@ CFLAGS := -g -Wall -Werror -mword-relocations \
$(ARCH) \
$(BUILD_CFLAGS)
CFLAGS += $(INCLUDE) -DARM11 -D_3DS
CFLAGS += $(INCLUDE) -D__3DS__
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

5
libctru/include/3ds.h
View File

@ -8,6 +8,11 @@
extern "C" {
#endif
#if defined(_3DS) && !defined(__3DS__)
#warning "Please update your Makefile and replace -DARM11 -D_3DS with -D__3DS__"
#define __3DS__
#endif
//might be missing some
#include <3ds/types.h>
#include <3ds/result.h>

5
libctru/source/applets/error.c
View File

@ -1,4 +1,3 @@
#include <3ds.h>
#include <string.h>
#include <3ds/types.h>
#include <3ds/synchronization.h>
@ -40,7 +39,7 @@ static void errorConvertToUTF16(u16* out, const char* in, size_t max)
return;
}
out[units] = 0;
out[units] = 0;
}
void errorText(errorConf *err, const char* text)
@ -49,6 +48,6 @@ void errorText(errorConf *err, const char* text)
}
void errorDisp(errorConf* err)
{
{
aptLaunchLibraryApplet(APPID_ERROR, err, sizeof(*err), 0);
}