xboxrt: Move supplemental C functions, add own Makefile

XboxDev · Sep 7, 2019 · 14d09ba · 14d09ba
1 parent f315c1a
commit 14d09ba
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -48,7 +48,8 @@ EXTRACT_XISO = $(NXDK_DIR)/tools/extract-xiso/extract-xiso
 TOOLS        = cxbe vp20compiler fp20compiler extract-xiso
 NXDK_CFLAGS  = -target i386-pc-win32 -march=pentium3 \
                -ffreestanding -nostdlib -fno-builtin -fno-exceptions \
-               -I$(NXDK_DIR)/lib -I$(NXDK_DIR)/lib/xboxrt \
+               -I$(NXDK_DIR)/lib -I$(NXDK_DIR)/lib/xboxrt/libc_extensions \
+               -I$(NXDK_DIR)/lib/hal \
                -isystem $(NXDK_DIR)/lib/pdclib/include \
                -I$(NXDK_DIR)/lib/pdclib/platform/xbox/include \
                -I$(NXDK_DIR)/lib/winapi \

diff --git a/lib/Makefile b/lib/Makefile
@@ -20,7 +20,6 @@ USB_SRCS := \
 	$(NXDK_DIR)/lib/usb/misc/malloc.c
 
 SRCS += \
-	$(wildcard $(NXDK_DIR)/lib/xboxrt/*.c) \
 	$(shell find $(NXDK_DIR)/lib/pdclib/functions/ -name "*.c") \
 	$(shell find $(NXDK_DIR)/lib/pdclib/platform/xbox/ -name "*.c") \
 	$(shell find $(NXDK_DIR)/lib/pdclib/platform/xbox/ -name "*.s") \
@@ -30,3 +29,5 @@ SRCS += \
 	$(wildcard $(NXDK_DIR)/lib/winapi/*.c) \
 	$(wildcard $(NXDK_DIR)/lib/pbkit/*.c) \
 	$(USB_SRCS)
+
+include $(NXDK_DIR)/lib/xboxrt/Makefile
diff --git a/lib/xboxrt/debug.c → lib/hal/debug.c b/lib/xboxrt/debug.c → lib/hal/debug.c
diff --git a/lib/xboxrt/debug.h → lib/hal/debug.h b/lib/xboxrt/debug.h → lib/hal/debug.h
diff --git a/lib/hal/fileio.c b/lib/hal/fileio.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <hal/fileio.h>
 #include <xboxkrnl/xboxkrnl.h>
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include <stdbool.h>
 
 // #define DEBUG

diff --git a/lib/xboxrt/font_sasteroids2.h → lib/hal/font_sasteroids2.h b/lib/xboxrt/font_sasteroids2.h → lib/hal/font_sasteroids2.h
diff --git a/lib/xboxrt/font_terminal.h → lib/hal/font_terminal.h b/lib/xboxrt/font_terminal.h → lib/hal/font_terminal.h
diff --git a/lib/hal/xbox.c b/lib/hal/xbox.c
@@ -5,7 +5,7 @@
 #include <xboxkrnl/xboxkrnl.h>
 
 #include <stdio.h>
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 
 #define KernelMode 0
 

diff --git a/lib/net/pktdrv/pktdrv.c b/lib/net/pktdrv/pktdrv.c
@@ -24,7 +24,7 @@
 //mess with fpu unless you save and restore fpu processor state)
 
 #include <hal/xbox.h>
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include <xboxkrnl/xboxkrnl.h>
 
 #include "string.h"

diff --git a/lib/pbkit/pbkit.c b/lib/pbkit/pbkit.c
@@ -19,7 +19,7 @@
 #include <hal/xbox.h>
 #include <hal/io.h>
 #include <xboxkrnl/xboxkrnl.h>
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 
 #include "pbkit.h"
 #include "outer.h"

diff --git a/lib/xboxrt/Makefile b/lib/xboxrt/Makefile
@@ -0,0 +1,4 @@
+SRCS += \
+	$(NXDK_DIR)/lib/xboxrt/libc_extensions/stat.c \
+	$(NXDK_DIR)/lib/xboxrt/libc_extensions/strings.c \
+	$(NXDK_DIR)/lib/xboxrt/libc_extensions/wchar.c
diff --git a/lib/xboxrt/stat.c → lib/xboxrt/libc_extensions/stat.c b/lib/xboxrt/stat.c → lib/xboxrt/libc_extensions/stat.c
diff --git a/lib/xboxrt/stat.h → lib/xboxrt/libc_extensions/stat.h b/lib/xboxrt/stat.h → lib/xboxrt/libc_extensions/stat.h
diff --git a/lib/xboxrt/strings.c → lib/xboxrt/libc_extensions/strings.c b/lib/xboxrt/strings.c → lib/xboxrt/libc_extensions/strings.c
diff --git a/lib/xboxrt/strings.h → lib/xboxrt/libc_extensions/strings.h b/lib/xboxrt/strings.h → lib/xboxrt/libc_extensions/strings.h
diff --git a/lib/xboxrt/unistd.h → lib/xboxrt/libc_extensions/unistd.h b/lib/xboxrt/unistd.h → lib/xboxrt/libc_extensions/unistd.h
diff --git a/lib/xboxrt/wchar.c → lib/xboxrt/libc_extensions/wchar.c b/lib/xboxrt/wchar.c → lib/xboxrt/libc_extensions/wchar.c
diff --git a/lib/xboxrt/wchar.h → lib/xboxrt/libc_extensions/wchar.h b/lib/xboxrt/wchar.h → lib/xboxrt/libc_extensions/wchar.h
diff --git a/samples/hello++/main.cpp b/samples/hello++/main.cpp
@@ -1,4 +1,4 @@
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include <pbkit/pbkit.h>
 #include <hal/video.h>
 #include <hal/xbox.h>

diff --git a/samples/hello/main.c b/samples/hello/main.c
@@ -1,4 +1,4 @@
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include <pbkit/pbkit.h>
 #include <hal/video.h>
 #include <hal/xbox.h>

diff --git a/samples/mesh/main.c b/samples/mesh/main.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <strings.h>
 #include <xboxkrnl/xboxkrnl.h>
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include "math3d.h"
 
 static uint32_t *alloc_vertices;

diff --git a/samples/sdl/main.c b/samples/sdl/main.c
@@ -10,7 +10,7 @@
   freely.
 */
 /* Simple program:  Create a native window and attach an SDL renderer */
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include <pbkit/pbkit.h>
 #include <hal/xbox.h>
 #include <hal/video.h>

diff --git a/samples/sdl_ttf/main.c b/samples/sdl_ttf/main.c
@@ -1,4 +1,4 @@
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include <pbkit/pbkit.h>
 #include <hal/xbox.h>
 #include <hal/video.h>

diff --git a/samples/triangle/main.c b/samples/triangle/main.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <strings.h>
 #include <xboxkrnl/xboxkrnl.h>
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 
 static uint32_t *alloc_vertices;
 static uint32_t  num_vertices;

diff --git a/samples/winapi_filefind/main.c b/samples/winapi_filefind/main.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <fileapi.h>
 #include <winerror.h>
-#include <xboxrt/debug.h>
+#include <hal/debug.h>
 #include <pbkit/pbkit.h>
 #include <hal/video.h>
 #include <hal/xbox.h>