Fix new 3ds xl not being detected, others
Also fixes whitespace in makefile and platform_ctr.c and compiles with debug libctru when DEBUG=1
This commit is contained in:
parent
7dbaa45172
commit
d18ee7eaed
|
@ -136,7 +136,13 @@ LDFLAGS += -specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
|
||||||
CFLAGS += -std=gnu99 -ffast-math
|
CFLAGS += -std=gnu99 -ffast-math
|
||||||
|
|
||||||
|
|
||||||
LIBS := $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lctru -lm
|
LIBS := $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
|
||||||
|
|
||||||
|
ifeq ($(DEBUG), 1)
|
||||||
|
LIBS += -lctrud
|
||||||
|
else
|
||||||
|
LIBS += -lctru
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(BUILD_3DSX), 1)
|
ifeq ($(BUILD_3DSX), 1)
|
||||||
|
|
|
@ -486,6 +486,7 @@ unsigned cpu_features_get_core_amount(void)
|
||||||
return 2;
|
return 2;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
|
case 4:
|
||||||
case 5:
|
case 5:
|
||||||
/*New 3/2DS*/
|
/*New 3/2DS*/
|
||||||
return 4;
|
return 4;
|
||||||
|
|
|
@ -321,11 +321,9 @@ bool network_init(void)
|
||||||
_net_compat_net_memory = (u32*)memalign(SOC_ALIGN, SOC_BUFFERSIZE);
|
_net_compat_net_memory = (u32*)memalign(SOC_ALIGN, SOC_BUFFERSIZE);
|
||||||
if (_net_compat_net_memory == NULL)
|
if (_net_compat_net_memory == NULL)
|
||||||
return false;
|
return false;
|
||||||
//RARCH_LOG("Wifi Buffer at: [0x%08X]\n", (u32)_net_compat_net_memory);
|
|
||||||
Result ret = socInit(_net_compat_net_memory, SOC_BUFFERSIZE);//WIFI init
|
Result ret = socInit(_net_compat_net_memory, SOC_BUFFERSIZE);//WIFI init
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
return false;
|
return false;
|
||||||
//RARCH_LOG("Socket Status: [0x%08X]\n", (uint32_t)ret);
|
|
||||||
#else
|
#else
|
||||||
signal(SIGPIPE, SIG_IGN); /* Do not like SIGPIPE killing our app. */
|
signal(SIGPIPE, SIG_IGN); /* Do not like SIGPIPE killing our app. */
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue