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

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

View File

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

View File

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

View File

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