Attempt to reach compatibility with upstream nxdk

Author: JayFoxRox

Makefile.xbox renamed to Makefile.nxdk

@@ -1,4 +1,3 @@
-NXDK_DIR = $(CURDIR)/../nxdk
 //NXDK_SDL = y
 
 XBE_TITLE = OpenSWE1R
@@ -20,8 +19,7 @@ SRCS += $(CURDIR)/com/dplay.c
 
 SRCS += $(CURDIR)/uc_native.c
 
-SRCS += $(CURDIR)/xbox-hacks/qsort.c
-SRCS += $(CURDIR)/xbox-hacks/bsearch.c
+CFLAGS += -isystem$(CURDIR)/xbox-hacks
 
 CFLAGS += -DUC_NATIVE=1 -DUC_KVM=1
 CFLAGS += -I/usr/include/unicorn

main.c

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <assert.h>
+#include <ctype.h>
 
 #include "common.h"
 #include "descriptor.h"
@@ -32,6 +33,17 @@
 #endif
 
 
+//FIXME: REMOVE THIS BLOCK! Only used during development
+#ifdef XBOX
+#define debugPrint(fmt, ...)
+#else
+#include <xboxrt/debug.h>
+#endif
+#ifdef XBOX
+#include <pbkit/pbkit.h>
+#include <hal/video.h>
+#endif
+
 #include "SDL.h"
 static SDL_Window* sdlWindow;
 
@@ -4284,23 +4296,6 @@ asm("_get_idt@4:\n"
 
 #endif
 
-#ifdef XBOX
-// Stolen from https://gist.github.com/mmozeiko/ae38aeb10add7cb66be4c00f24f8e688
-
-// C initializers
-__attribute__((section(".CRT$XCA"))) _PVFV __xc_a[] = { 0 };
-__attribute__((section(".CRT$XCZ"))) _PVFV __xc_z[] = { 0 };
-
-static void win32_crt_call(_PVFV* a, _PVFV* b) {
-  while (a != b) {
-    if (*a) {
-      (**a)();
-    }
-    a++;
-  }
-}
-#endif
-
 int main(int argc, char* argv[]) {
 #ifdef XBOX
 
@@ -4312,6 +4307,7 @@ int main(int argc, char* argv[]) {
   //FIXME: Seems to crash without pb_init?!
   //       As workaround, we use pb to show debug buffer, but then kill it.
   //       We simply don't need pbkit right now.
+  XVideoSetMode(640, 480, 32, REFRESH_DEFAULT); 
   pb_init();
   pb_show_debug_screen();
   //pb_kill();
@@ -4345,12 +4341,6 @@ for(int i = 0; i <= 0x13; i++) {
 
 #endif
 
-#ifdef XBOX
-  printf("-- Running CRT functions ()\n");
-  win32_crt_call(__xc_a, __xc_z);
-#endif
-
-
   printf("-- Initializing\n");
   printf("Version: %s\n", APP_VERSION_STRING);
   InitializeEmulation();

xbox-hacks/GL

@@ -0,0 +1 @@
+/usr/include/GL

xbox-hacks/bsearch.c

@@ -6,14 +6,15 @@
 
 #include <stdio.h>
 
-#include <GL/glew.h>
-
+#include <stddef.h>
 #include <assert.h>
 #include <stdbool.h>
-
+#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 
+#define _PTRDIFF_T_DEFINED
+#include <GL/glew.h>
 
 #include "xbox.h"
 
@@ -560,7 +561,7 @@ GLEWAPI GLboolean glewExperimental = GL_FALSE;
 
 GLEWAPI const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error) {
   printf("%s\n", __func__);
-  return "<glew error string>";
+  return (GLubyte*)"<glew error string>";
 }
 
 GLEWAPI GLenum GLEWAPIENTRY glewInit (void) {
@@ -603,7 +604,7 @@ SDL_Window* SDL_CreateWindow(const char* title,
                              int         h,
                              Uint32      flags) {
   printf("%s\n", __func__);
-  return 1;
+  return (SDL_Window*)1;
 }
 
 void SDL_Delay(Uint32 ms) {
@@ -641,7 +642,7 @@ Uint64 SDL_GetPerformanceFrequency(void) {
 
 SDL_GLContext SDL_GL_CreateContext(SDL_Window* window) {
   printf("%s\n", __func__);
-  return 1;
+  return (SDL_GLContext)1;
 }
 
 int SDL_GL_SetAttribute(SDL_GLattr attr, int        value) {