Skip to content
This repository has been archived by the owner on Dec 15, 2020. It is now read-only.

Commit

Permalink
Updated for latest ctrulib. Switched to using the devkitARM .ld. This…
Browse files Browse the repository at this point in the history
… fixes building issues with latest ctrulib+devkitARM.
  • Loading branch information
yellows8 committed Jan 12, 2016
1 parent efc29ac commit ac0d55e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 168 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ CFLAGS += $(INCLUDE) -DARM11 -D_3DS -DVERSION=\"$(VERSION)\"
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

ASFLAGS := -g $(ARCH)
LDFLAGS = -nostartfiles -T../hblauncher_loader.ld -g $(ARCH) -Wl,-Map,$(notdir $*.map)
LDFLAGS = -nostartfiles -T$(DEVKITARM)/arm-none-eabi/lib/3dsx.ld -g $(ARCH) -Wl,-Map,$(notdir $*.map)

LIBS := -lctru -lm

Expand Down
162 changes: 0 additions & 162 deletions hblauncher_loader.ld

This file was deleted.

10 changes: 5 additions & 5 deletions source/hblauncher_loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ char regionids_table[7][4] = {//http://3dbrew.org/wiki/Nandrw/sys/SecureInfo_A

void gxlowcmd_4(u32* inadr, u32* outadr, u32 size, u32 width0, u32 height0, u32 width1, u32 height1, u32 flags)
{
GX_SetTextureCopy(NULL, inadr, width0 | (height0<<16), outadr, width1 | (height1<<16), size, flags);
GX_TextureCopy(inadr, width0 | (height0<<16), outadr, width1 | (height1<<16), size, flags);
}

Result gsp_flushdcache(u8* adr, u32 size)
{
return GSPGPU_FlushDataCache(NULL, adr, size);
return GSPGPU_FlushDataCache(adr, size);
}

Result http_getactual_payloadurl(char *requrl, char *outurl, u32 outurl_maxsize)
Expand Down Expand Up @@ -215,7 +215,7 @@ Result load_hblauncher()

printf("Getting system-version/system-info etc...\n");

ret = initCfgu();
ret = cfguInit();
if(ret!=0)
{
printf("Failed to init cfgu: 0x%08x.\n", (unsigned int)ret);
Expand All @@ -233,9 +233,9 @@ Result load_hblauncher()
ret = -9;
return ret;
}
exitCfgu();
cfguExit();

APT_CheckNew3DS(NULL, &new3dsflag);
APT_CheckNew3DS(&new3dsflag);

ret = osGetSystemVersionData(&nver_versionbin, &cver_versionbin);
if(ret!=0)
Expand Down

0 comments on commit ac0d55e

Please sign in to comment.