NDS: Fix compiling and use own folder

2025-09-07 12:40:09 +10:00 · 2025-09-07 12:40:09 +10:00 · da0b7c8484
parent f68f7ffaf0
commit da0b7c8484
9 changed files with 2 additions and 7 deletions
--- a/2
+++ b/2
@ -268,7 +268,7 @@ n64:
 gba:
 	$(MAKE) -f misc/gba/Makefile
 ds:
-	$(MAKE) -f misc/ds/Makefile
+	$(MAKE) -f misc/nds/Makefile
 3ds:
 	$(MAKE) -f misc/3ds/Makefile
 gamecube:
--- a/misc/nds/Makefile
+++ b/misc/nds/Makefile
--- a/misc/nds/Makefile.arm7
+++ b/misc/nds/Makefile.arm7
--- a/misc/nds/Makefile.arm9
+++ b/misc/nds/Makefile.arm9
@ -6,7 +6,7 @@ export BLOCKSDSEXT		?= /opt/wonderful/thirdparty/blocksds/external
 export WONDERFUL_TOOLCHAIN	?= /opt/wonderful
 ARM_NONE_EABI_PATH		?= $(WONDERFUL_TOOLCHAIN)/toolchain/gcc-arm-none-eabi/bin/

-SOURCEDIRS	:= src
+SOURCEDIRS	:= src src/nds
 INCLUDEDIRS     :=
 DSIWIFI		:= third_party/dsiwifi

--- a/misc/nds/icon.bmp
+++ b/misc/nds/icon.bmp
--- a/misc/nds/main_arm7.c
+++ b/misc/nds/main_arm7.c
--- a/src/nds/Graphics_NDS.c
+++ b/src/nds/Graphics_NDS.c
--- a/src/nds/Platform_NDS.c
+++ b/src/nds/Platform_NDS.c
@ -546,13 +546,8 @@ cc_result Socket_CheckWritable(cc_socket s, cc_bool* writable) {
 	if (res || *writable) return res;
 	
 	/* https://stackoverflow.com/questions/29479953/so-error-value-after-successful-socket-operation */
-#ifdef BUILD_DSI
 	socklen_t resultSize = sizeof(socklen_t);
 	getsockopt(s, SOL_SOCKET, SO_ERROR, &res, &resultSize);
-#else
-	int resultSize = sizeof(int);
-	getsockopt(s, SOL_SOCKET, SO_ERROR, &res, &resultSize);
-#endif
 	return res;
 }

--- a/src/nds/Window_NDS.c
+++ b/src/nds/Window_NDS.c