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

Merge branch 'refactor' of https://github.com/smealum/ctrulib into refactor

Browse Source
This commit is contained in:
plutoo 2014-08-24 22:51:19 +02:00
commit 41c2a759f8
7 changed files with 174 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libctru/Makefile
View File

@ -24,18 +24,17 @@ INCLUDES := include
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ARCH := -marm ARCH := -march=armv6k -mtune=mpcore
CFLAGS := -g -Wall -O2 -mthumb-interwork\ CFLAGS := -g -Wall -O2 -mword-relocations \
-mcpu=mpcore -mtune=mpcore \ -fomit-frame-pointer -ffast-math \
-mfpu=vfp -ffast-math -mword-relocations \
$(ARCH) $(ARCH)
CFLAGS += $(INCLUDE) -DARM11 -D_3DS CFLAGS += $(INCLUDE) -DARM11 -D_3DS
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
ASFLAGS := -g $(ARCH) -mcpu=mpcore -mtune=mpcore CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
ASFLAGS := -g $(ARCH)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing

1
libctru/include/3ds/os.h
View File

@ -1,7 +1,6 @@
#ifndef OS_H #ifndef OS_H
#define OS_H #define OS_H
#define SYSTEM_VERSION(major, minor, revision) \ #define SYSTEM_VERSION(major, minor, revision) \
(((major)<<24)|((minor)<<16)|((revision)<<8)) (((major)<<24)|((minor)<<16)|((revision)<<8))

2
libctru/include/3ds/svc.h
View File

@ -5,7 +5,6 @@
#ifndef SVC_H #ifndef SVC_H
#define SVC_H #define SVC_H
typedef enum { typedef enum {
MEMOP_FREE =1, // Free heap MEMOP_FREE =1, // Free heap
MEMOP_ALLOC=3, // Allocate heap MEMOP_ALLOC=3, // Allocate heap
@ -50,5 +49,4 @@ s32 svcConnectToPort(volatile Handle* out, const char* portName);
s32 svcSendSyncRequest(Handle session); s32 svcSendSyncRequest(Handle session);
s32 svcGetProcessId(u32 *out, Handle handle); s32 svcGetProcessId(u32 *out, Handle handle);
#endif #endif