Initial, hacky nintendo switch support

Author: blueberrymuffin3

3rdparty/linenoise/linenoise.c

@@ -114,9 +114,11 @@
 //#define snprintf _snprintf
 #endif
 #else
+#ifndef __DEVKITPRO__
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <poll.h>
+#endif
 #define USE_TERMIOS
 #define HAVE_UNISTD_H
 #endif
@@ -248,7 +250,9 @@ static int checkForColor(const char *buf, int *colors, int *size)
 
 #if defined(USE_TERMIOS)
 static void linenoiseAtExit(void);
+#ifndef __DEVKITPRO__
 static struct termios orig_termios; /* in order to restore at exit */
+#endif
 static int rawmode = 0; /* for atexit() function to check if restore is needed*/
 static int atexit_registered = 0; /* register atexit just 1 time */
 
@@ -269,6 +273,7 @@ static int isUnsupportedTerm(void) {
 }
 
 static int enableRawMode(struct current *current) {
+#ifndef __DEVKITPRO__
     struct termios raw;
 
     current->fd = STDIN_FILENO;
@@ -280,12 +285,14 @@ static int enableRawMode(struct current *current) {
         errno = ENOTTY;
         return -1;
     }
+#endif
 
     if (!atexit_registered) {
         atexit(linenoiseAtExit);
         atexit_registered = 1;
     }
 
+#ifndef __DEVKITPRO__
     raw = orig_termios;  /* modify the original mode */
     /* input modes: no break, no CR to NL, no parity check, no strip char,
      * no start/stop output control. */
@@ -306,20 +313,25 @@ static int enableRawMode(struct current *current) {
         goto fatal;
     }
     rawmode = 1;
+#endif
     return 0;
 }
 
 static void disableRawMode(struct current *current) {
+#ifndef __DEVKITPRO__
     /* Don't even check the return value as it's too late. */
     if (rawmode && tcsetattr(current->fd,TCSADRAIN,&orig_termios) != -1)
         rawmode = 0;
+#endif
 }
 
 /* At exit we'll try to fix the terminal to the initial conditions. */
 static void linenoiseAtExit(void) {
+#ifndef __DEVKITPRO__
     if (rawmode) {
         tcsetattr(STDIN_FILENO, TCSADRAIN, &orig_termios);
     }
+#endif
     linenoiseHistoryFree();
 }
 
@@ -388,8 +400,9 @@ static void setCursorPos(struct current *current, int x)
  */
 static int fd_read_char(int fd, int timeout)
 {
-    struct pollfd p;
     unsigned char c;
+#ifndef __DEVKITPRO__
+    struct pollfd p;
 
     p.fd = fd;
     p.events = POLLIN;
@@ -398,6 +411,7 @@ static int fd_read_char(int fd, int timeout)
         /* timeout */
         return -1;
     }
+#endif
     if (read(fd, &c, 1) != 1) {
         return -1;
     }
@@ -410,8 +424,9 @@ static int fd_read_char(int fd, int timeout)
  */
 static int fd_read(struct current *current)
 {
-    struct pollfd p;
     int ret;
+#ifndef __DEVKITPRO__
+    struct pollfd p;
     p.fd = current->fd;
     p.events = POLLIN;
     while(1) {
@@ -427,6 +442,7 @@ static int fd_read(struct current *current)
         else
             break;
     }
+#endif
 #ifdef USE_UTF8
     char buf[4];
     int n;
@@ -499,12 +515,14 @@ static int queryCursor(int fd, int* cols)
  */
 static int getWindowSize(struct current *current)
 {
+#ifndef __DEVKITPRO__
     struct winsize ws;
 
     if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == 0 && ws.ws_col != 0) {
         current->cols = ws.ws_col;
         return 0;
     }
+#endif
 
     /* Failed to query the window size. Perhaps we are on a serial terminal.
      * Try to query the width by sending the cursor as far to the right

3rdparty/lsqlite3/lsqlite3.c

@@ -1209,6 +1209,7 @@ static int db_create_collation(lua_State *L) {
     return 0;
 }
 
+#ifndef __DEVKITPRO__
 /* Thanks to Wolfgang Oertl...
 */
 static int db_load_extension(lua_State *L) {
@@ -1236,6 +1237,7 @@ static int db_load_extension(lua_State *L) {
     sqlite3_free(errmsg);
     return 2;
 }
+#endif
 
 /*
 ** trace callback:
@@ -2192,7 +2194,9 @@ static const luaL_Reg dblib[] = {
     {"create_function",     db_create_function      },
     {"create_aggregate",    db_create_aggregate     },
     {"create_collation",    db_create_collation     },
+#ifndef __DEVKITPRO__
     {"load_extension",      db_load_extension       },
+#endif
 
     {"trace",               db_trace                },
     {"progress_handler",    db_progress_handler     },

3rdparty/sqlite3/sqlite3.c

@@ -926,7 +926,9 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt){
 #else
 /* This is not VxWorks. */
 #define OS_VXWORKS 0
+#ifndef __DEVKITPRO__
 #define HAVE_FCHOWN 1
+#endif
 #define HAVE_READLINK 1
 #define HAVE_LSTAT 1
 #endif /* defined(_WRS_KERNEL) */
@@ -33440,7 +33442,9 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
 #include <sys/ioctl.h>
+#endif
 #include <unistd.h>
 /* #include <time.h> */
 #include <sys/time.h>

Makefile.libretro

@@ -151,8 +151,13 @@ ifeq ($(platform),android-x86_64)
 	PTR64 :=
 endif
 
-ifeq ($(platform),linux32)
+ifeq ($(platform),libnx)
 	PTR64 := 0
+	PLATFLAGS += TARGETOS="libnx" PLATFORM="arm64" FORCE_DRC_C_BACKEND="1"
+	LIBRETRO_CPU :=
+	ARCH :=
+	LIBRETRO_OS :=
+	PTR64 :=
 endif
 
 ifeq ($(platform),osx)
@@ -243,6 +248,7 @@ build:
 	@mv $(SUBTARGET)_libretro.dll $(SAME_SYSTEM)_libretro.dll 2> /dev/null || true
 	@mv $(SUBTARGET)_libretro.so $(SAME_SYSTEM)_libretro.so 2> /dev/null || true
 	@mv $(SUBTARGET)_libretro_android.so $(SAME_SYSTEM)_libretro_android.so 2> /dev/null || true
+	@mv $(SUBTARGET)_libretro.a $(SAME_SYSTEM)_libretro.a 2> /dev/null || true
 	@echo "Done!"
 
 vs2015:

makefile

@@ -1436,6 +1436,18 @@ openbsd_x86: generate $(PROJECTDIR)/$(MAKETYPE)-openbsd/Makefile
 	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-openbsd config=$(CONFIG)32 precompile
 	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-openbsd config=$(CONFIG)32
 
+#-------------------------------------------------
+# gmake-linux
+#-------------------------------------------------
+
+$(PROJECTDIR)/$(MAKETYPE)-libnx/Makefile: makefile $(SCRIPTS) $(GENIE)
+	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=libnx --gcc_version=$(GCC_VERSION) $(MAKETYPE)
+
+.PHONY: libnx-arm64
+libnx: generate $(PROJECTDIR)/$(MAKETYPE)-libnx/Makefile
+	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-libnx-arm64 config=$(CONFIG) precompile
+	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-libnx-arm64 config=$(CONFIG)
+
 #-------------------------------------------------
 # Clean/bootstrap
 #-------------------------------------------------

scripts/genie.lua

@@ -126,6 +126,7 @@ newoption {
 		{ "windows",       "Windows"                },
 		{ "haiku",         "Haiku"                  },
 		{ "solaris",       "Solaris SunOS"          },
+		{ "libnx",         "libnx"                  },
 	},
 }
 

scripts/src/3rdparty.lua

@@ -857,7 +857,7 @@ end
 			"LUA_COMPAT_5_1",
 			"LUA_COMPAT_5_2",
 		}
-	if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then
+	if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") and not (_OPTIONS["targetos"]=="libnx") then
 		defines {
 			"LUA_USE_POSIX",
 		}
@@ -981,6 +981,10 @@ if _OPTIONS["vs"]=="clangcl" then
 end
 
 	configuration { }
+	defines {
+		"SQLITE_OMIT_WAL",
+		"SQLITE_OMIT_LOAD_EXTENSION",
+	}
 
 	files {
 		MAME_DIR .. "3rdparty/sqlite3/sqlite3.c",

scripts/src/main.lua

@@ -24,7 +24,11 @@ else
 	project (_subtarget)
 end
 	uuid (os.uuid(_target .."_" .. _subtarget))
-	kind "ConsoleApp"
+	if _OPTIONS["targetos"]=="libnx" then
+		kind "StaticLib"
+	else
+		kind "ConsoleApp"
+	end
 
 	configuration { "android*" }
 	linkoptions {
@@ -65,7 +69,9 @@ end
 		targetextension ".bc"
 	-- BEGIN libretro overrides to MAME's GENie build
 	configuration { "libretro*" }
-		kind "SharedLib"	
+		if _OPTIONS["targetos"]~="libnx" then
+			kind "SharedLib"
+		end
 		targetsuffix "_libretro"
 		if _OPTIONS["targetos"]=="android" then
 			targetsuffix "_libretro_android"

scripts/src/osd/retro.lua

@@ -55,9 +55,10 @@ if BASE_TARGETOS=="unix" then
 					"nsl",
 				}
 			else
-				links {
-					"util",
-				}
+				-- What are you needed for? nobody knows...
+				-- links {
+				-- 	"util",
+				-- }
 			end
 		end
 

scripts/toolchain.lua

@@ -33,6 +33,7 @@ newoption {
 		{ "osx",           "OSX (GCC compiler)"     },
 		{ "osx-clang",     "OSX (Clang compiler)"   },
 		{ "solaris",       "Solaris"                },
+		{ "libnx",         "libnx"                  },
 	},
 }
 
@@ -208,6 +209,13 @@ function toolchain(_buildDir, _subDir)
 			premake.gcc.ar  = toolchainPrefix .. "ar"
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
 		end
+
+		if "libnx" == _OPTIONS["gcc"] then
+			premake.gcc.cc  = "aarch64-none-elf-gcc"
+			premake.gcc.cxx = "aarch64-none-elf-g++"
+			premake.gcc.ar  = "aarch64-none-elf-ar"
+			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-libnx-arm64")
+		end
 	elseif _ACTION == "vs2019" then
 
 		if "clangcl" == _OPTIONS["vs"] then
@@ -686,6 +694,38 @@ function toolchain(_buildDir, _subDir)
 	configuration { "rpi" }
 		targetdir (_buildDir .. "rpi" .. "/bin")
 		objdir (_buildDir .. "rpi" .. "/obj")
+
+	configuration { "libnx" }
+		systemincludedirs {
+			"/opt/devkitpro/libnx/include",
+			"/opt/devkitpro/portlibs/switch/include",
+		}
+		defines {
+			"LLONG_MAX=0x7fffffffffffffffLL",
+			"LLONG_MIN=-0x8000000000000000LL",
+			"ULLONG_MAX=0xffffffffffffffffLL",
+		}
+		libdirs {
+			"/opt/devkitpro/libnx/lib",
+			"/opt/devkitpro/portlibs/switch/lib",
+		}
+		links {
+			"nx",
+		}
+		buildoptions {
+			"-g -ffunction-sections",
+			"-march=armv8-a -mtune=cortex-a57 -mtp=soft",
+		}
+		buildoptions_cpp {
+			-- Added by libretro-super, but we seem to need these
+			-- "-fno-rtti -fno-exceptions",
+		}
+		linkoptions {
+			"-specs=/opt/devkitpro/libnx/switch.specs",
+			"-march=armv8-a -mtune=cortex-a57 -mtp=soft",
+			"-ftls-model=local-exec",
+		}
+
 -- BEGIN libretro overrides to MAME's GENie build
 
 	configuration { "libretro*" }