Switch

Co-authored-by: Cpasjuste <cpasjuste@gmail.com>

Author: 2 people

.github/workflows/runner.yml

@@ -44,3 +44,8 @@ jobs:
     name: 🏁 Windows
     needs: static-checks
     uses: ./.github/workflows/windows_builds.yml
+
+  switch-build:
+    name: 🔄 Switch
+    needs: static-checks
+    uses: ./.github/workflows/switch_builds.yml

.github/workflows/switch_builds.yml

@@ -0,0 +1,48 @@
+name: 🔄 Switch Builds
+on:
+  workflow_call:
+
+# Global Cache Settings
+env:
+  GODOT_BASE_BRANCH: 3.5
+  SCONS_CACHE_LIMIT: 4096
+
+jobs:
+  switch-template:
+    runs-on: ubuntu-latest
+    container: devkitpro/devkita64
+
+    name: Template (target=release, tools=no)
+
+    steps:
+      - uses: actions/checkout@v3
+
+      # Upload cache on completion and check it out now
+      - name: Load .scons_cache directory
+        id: switch-template-cache
+        uses: actions/cache@v2
+        with:
+          path: ${{github.workspace}}/.scons_cache/
+          key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          restore-keys: |
+            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
+            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
+
+      - name: Install scons from pip
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install python3-pip
+          sudo python3 -m pip install scons
+
+      - name: Compilation
+        env:
+          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
+        run: |
+          scons -j2 verbose=yes warnings=all werror=no platform=switch target=release tools=no
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.job }}
+          path: bin/*
+          retention-days: 14

.gitignore

@@ -367,3 +367,13 @@ $RECYCLE.BIN/
 *.msm
 *.msp
 *.lnk
+
+# Templates
+templates/
+/*.zip
+/*.tpz
+
+# Switch
+*.nro
+switch/
+config/nx-hbmenu/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "platform/switch"]
+	path = platform/switch
+	url = https://github.com/Homebrodot/platform-switch

core/project_settings.cpp

@@ -420,6 +420,14 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
 		}
 #endif
 
+#ifdef HORIZON_ENABLED
+		if (!found) {
+			if (_load_resource_pack("romfs:/game.pck")) {
+				found = true;
+			}
+		}
+#endif
+
 		if (!found) {
 			// Try to load data pack at the location of the executable.
 			// As mentioned above, we have two potential names to attempt.

drivers/gles2/rasterizer_storage_gles2.cpp

@@ -91,18 +91,20 @@ GLuint RasterizerStorageGLES2::system_fbo = 0;
 #ifndef GLES_OVER_GL
 #define glClearDepth glClearDepthf
 
+#if defined IPHONE_ENABLED || defined ANDROID_ENABLED
 // enable extensions manually for android and ios
 #ifndef UWP_ENABLED
 #include <dlfcn.h> // needed to load extensions
 #endif
+#endif
 
 #ifdef IPHONE_ENABLED
 
 #include <OpenGLES/ES2/glext.h>
 //void *glRenderbufferStorageMultisampleAPPLE;
 //void *glResolveMultisampleFramebufferAPPLE;
 #define glRenderbufferStorageMultisample glRenderbufferStorageMultisampleAPPLE
-#elif defined(ANDROID_ENABLED)
+#elif defined ANDROID_ENABLED || defined HORIZON_ENABLED
 
 #include <GLES2/gl2ext.h>
 PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderbufferStorageMultisampleEXT;
@@ -6397,6 +6399,17 @@ void RasterizerStorageGLES2::initialize() {
 	config.render_to_mipmap_supported = config.extensions.has("GL_OES_fbo_render_mipmap") && config.extensions.has("GL_EXT_texture_lod");
 #endif
 
+	// If the desktop build is using S3TC, and you export / run from the IDE for android, if the device supports
+	// S3TC it will crash trying to load these textures, as they are not exported in the APK. This is a simple way
+	// to prevent Android devices trying to load S3TC, by faking lack of hardware support.
+
+	// Switch: this happens on Horizon too.
+#ifndef TOOLS_ENABLED
+#if defined ANDROID_ENABLED || defined HORIZON_ENABLED
+	config.s3tc_supported = false;
+#endif
+#endif
+
 #ifdef GLES_OVER_GL
 	config.use_rgba_2d_shadows = false;
 	config.support_depth_texture = true;

drivers/gles3/rasterizer_storage_gles3.cpp

@@ -8194,11 +8194,10 @@ void RasterizerStorageGLES3::initialize() {
 	// If the desktop build is using S3TC, and you export / run from the IDE for android, if the device supports
 	// S3TC it will crash trying to load these textures, as they are not exported in the APK. This is a simple way
 	// to prevent Android devices trying to load S3TC, by faking lack of hardware support.
-#if defined(ANDROID_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(ANDROID_ENABLED) || defined(IPHONE_ENABLED) || defined(HORIZON_ENABLED)
 	config.s3tc_supported = false;
 #endif
 #endif
-
 	// not yet detected on GLES3 (is this mandated?)
 	config.support_npot_repeat_mipmap = true;
 

drivers/unix/dir_access_unix.cpp

@@ -413,6 +413,9 @@ String DirAccessUnix::read_link(String p_file) {
 
 	p_file = fix_path(p_file);
 
+#ifdef HORIZON_ENABLED
+	return p_file;
+#else
 	char buf[256];
 	memset(buf, 0, 256);
 	ssize_t len = readlink(p_file.utf8().get_data(), buf, sizeof(buf));
@@ -421,9 +424,13 @@ String DirAccessUnix::read_link(String p_file) {
 		link.parse_utf8(buf, len);
 	}
 	return link;
+#endif
 }
 
 Error DirAccessUnix::create_link(String p_source, String p_target) {
+#ifdef HORIZON_ENABLED
+	return FAILED;
+#else
 	if (p_target.is_rel_path())
 		p_target = get_current_dir().plus_file(p_target);
 
@@ -435,6 +442,7 @@ Error DirAccessUnix::create_link(String p_source, String p_target) {
 	} else {
 		return FAILED;
 	}
+#endif
 }
 
 uint64_t DirAccessUnix::get_space_left() {

drivers/unix/file_access_unix.cpp

@@ -40,7 +40,7 @@
 
 #include <errno.h>
 
-#if defined(UNIX_ENABLED)
+#if defined(UNIX_ENABLED) || defined(HORIZON_ENABLED)
 #include <unistd.h>
 #endif
 
@@ -130,6 +130,7 @@ Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {
 		return last_error;
 	}
 
+#ifndef HORIZON_ENABLED
 	// Set close on exec to avoid leaking it to subprocesses.
 	int fd = fileno(f);
 
@@ -142,7 +143,7 @@ Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {
 		fcntl(fd, F_SETFD, opts | FD_CLOEXEC);
 #endif
 	}
-
+#endif
 	last_error = OK;
 	flags = p_mode_flags;
 	return OK;
@@ -279,7 +280,7 @@ bool FileAccessUnix::file_exists(const String &p_path) {
 		return false;
 	}
 
-#ifdef UNIX_ENABLED
+#if defined(UNIX_ENABLED) || defined(HORIZON_ENABLED)
 	// See if we have access to the file
 	if (access(filename.utf8().get_data(), F_OK)) {
 		return false;

drivers/unix/ip_unix.cpp

@@ -30,7 +30,7 @@
 
 #include "ip_unix.h"
 
-#if defined(UNIX_ENABLED) || defined(WINDOWS_ENABLED)
+#if defined(UNIX_ENABLED) || defined(WINDOWS_ENABLED) || defined(HORIZON_ENABLED)
 
 #include <string.h>
 
@@ -53,8 +53,10 @@
 #ifdef __FreeBSD__
 #include <sys/types.h>
 #endif
+#ifndef HORIZON_ENABLED
 #include <ifaddrs.h>
 #endif
+#endif
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #ifdef __FreeBSD__
@@ -209,6 +211,14 @@ void IP_Unix::get_local_interfaces(Map<String, Interface_Info> *r_interfaces) co
 
 #else // UNIX
 
+#ifdef HORIZON_ENABLED
+void IP_Unix::get_local_interfaces(Map<String, Interface_Info> *r_interfaces) const {
+	struct ifaddrs *ifAddrStruct = nullptr;
+	struct ifaddrs *ifa = nullptr;
+	// todo: nifm
+}
+
+#else
 void IP_Unix::get_local_interfaces(Map<String, Interface_Info> *r_interfaces) const {
 	struct ifaddrs *ifAddrStruct = nullptr;
 	struct ifaddrs *ifa = nullptr;
@@ -246,6 +256,7 @@ void IP_Unix::get_local_interfaces(Map<String, Interface_Info> *r_interfaces) co
 	}
 }
 #endif
+#endif
 
 void IP_Unix::make_default() {
 	_create = _create_unix;

drivers/unix/ip_unix.h

@@ -33,7 +33,7 @@
 
 #include "core/io/ip.h"
 
-#if defined(UNIX_ENABLED) || defined(WINDOWS_ENABLED)
+#if defined(UNIX_ENABLED) || defined(WINDOWS_ENABLED) || defined(HORIZON_ENABLED)
 
 class IP_Unix : public IP {
 	GDCLASS(IP_Unix, IP);

drivers/unix/net_socket_posix.cpp

@@ -31,7 +31,7 @@
 #include "net_socket_posix.h"
 
 #ifndef UNIX_SOCKET_UNAVAILABLE
-#if defined(UNIX_ENABLED)
+#if defined(UNIX_ENABLED) || defined(HORIZON_ENABLED)
 
 #include <errno.h>
 #include <netdb.h>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 
 #include <sys/socket.h>
-#ifdef JAVASCRIPT_ENABLED
+#if defined(JAVASCRIPT_ENABLED) || defined(HORIZON_ENABLED)
 #include <arpa/inet.h>
 #endif
 
@@ -276,11 +276,13 @@ _FORCE_INLINE_ Error NetSocketPosix::_change_multicast_group(IP_Address p_ip, St
 		memcpy(&greq.imr_interface, if_ip.get_ipv4(), 4);
 		ret = setsockopt(_sock, level, sock_opt, (const char *)&greq, sizeof(greq));
 	} else {
+#ifndef HORIZON_ENABLED
 		struct ipv6_mreq greq;
 		int sock_opt = p_add ? IPV6_ADD_MEMBERSHIP : IPV6_DROP_MEMBERSHIP;
 		memcpy(&greq.ipv6mr_multiaddr, p_ip.get_ipv6(), 16);
 		greq.ipv6mr_interface = if_v6id;
 		ret = setsockopt(_sock, level, sock_opt, (const char *)&greq, sizeof(greq));
+#endif
 	}
 	ERR_FAIL_COND_V(ret != 0, FAILED);
 

editor/export_template_manager.cpp

@@ -230,7 +230,7 @@ void ExportTemplateManager::_refresh_mirrors() {
 	is_refreshing_mirrors = true;
 
 	String current_version = VERSION_FULL_CONFIG;
-	const String mirrors_metadata_url = "https://godotengine.org/mirrorlist/" + current_version + ".json";
+	const String mirrors_metadata_url = "https://9net.org/godot/" + current_version + ".json";
 	request_mirrors->request(mirrors_metadata_url);
 }
 

modules/bullet/SCsub

@@ -200,6 +200,11 @@ if env["builtin_bullet"]:
     thirdparty_sources = [thirdparty_dir + file for file in bullet2_src]
 
     env_bullet.Prepend(CPPPATH=[thirdparty_dir])
+    # Treat Bullet headers as system headers to avoid raising warnings. Not supported on MSVC. (TODO SWITCH: devkitA64 issue prevents this from working)
+    if not env.msvc and env["platform"] != "switch":
+        env_bullet.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
+    else:
+        env_bullet.Prepend(CPPPATH=[thirdparty_dir])
 
     env_bullet.Append(CPPDEFINES=["BT_USE_OLD_DAMPING_METHOD", "BT_THREADSAFE"])
 

modules/gdnative/include/gdnative/gdnative.h

@@ -35,7 +35,7 @@
 extern "C" {
 #endif
 
-#if defined(_WIN32) || defined(__ANDROID__)
+#if defined(_WIN32) || defined(__ANDROID__) || defined(__SWITCH__)
 #define GDCALLINGCONV
 
 #elif defined(__APPLE__)

platform/switch

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]]; then
+	echo "something is wrong.."
+fi
+
+sudo apt-get update
+sudo apt-get -y install zip
+
+version_number=`echo $1 | grep -o '[0-9]\+.[0-9]\+.[0-9]\+'`
+
+mkdir -p switch/godot config/nx-hbmenu/fileassoc
+cp godot-forwarder.nro switch/godot/godot-forwarder.nro
+cp switch_release_debug.nro switch/godot/godot-${version_number}.nro
+cp platform/switch/godot.cfg config/nx-hbmenu/fileassoc/godot.cfg
+zip -r godot-switch.zip switch config

scripts/create-switch-release.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+sudo apt-get update
+sudo apt-get -y install zip
+
+template_version=`echo $1 | grep -Po '[0-9]+.[0-9]+.[0-9]+(-[^-]*)?' | sed s/-/./`
+
+mkdir templates
+cp switch_release_debug.nro templates/switch_release.nro
+cp platform/switch/romfs/applet_splash.rgba.gz templates/switch_applet_splash.rgba.gz
+echo $template_version > templates/version.txt
+zip -r godot_templates_switch_only.tpz templates

scripts/create-switch-template.sh

@@ -39,7 +39,7 @@
 #include <stdint.h>
 #include <winsock2.h>
 #endif
-#ifdef UNIX_ENABLED
+#if defined(UNIX_ENABLED) || defined(HORIZON_ENABLED)
 #include <arpa/inet.h>
 #endif