Merge branch 'master' into v2.93b

config.sh

@@ -937,13 +937,15 @@ if [ "$PLATFORM" = "3ds" ]; then
 	if [ "$SDL" != "false" ]; then
 		echo "Force-enabling GP2X 320x240 renderer (SDL on 3DS)."
 		GP2X="true"
+	else
+		echo "Force-disabling software renderer on 3DS."
+		echo "Building custom 3DS renderer."
+		SOFTWARE="false"
 	fi
 
 	echo "Force-disabling stack protector on 3DS."
 	STACK_PROTECTOR="false"
 
-	echo "Building custom 3DS renderer."
-
 	echo "Disabling utils on 3DS."
 	UTILS="false"
 

src/Makefile.in

@@ -280,6 +280,12 @@ ifeq (${BUILD_ENABLE_SCREENSHOTS},1)
 render_layer_software = 1
 endif
 
+# The editor requires the software layer renderer
+# (board screenshot export).
+ifeq (${BUILD_EDITOR},1)
+render_layer_software = 1
+endif
+
 # Software layer renderer
 # This one tends to take forever for many builds. Prefix it to
 # the list so hopefully it starts sooner during parallel builds.

src/configure.c

@@ -106,6 +106,8 @@
 #define FULLSCREEN_WIDTH_DEFAULT 400
 #define FULLSCREEN_HEIGHT_DEFAULT 240
 #define FORCE_BPP_DEFAULT 16
+#else
+#define VIDEO_OUTPUT_DEFAULT "3ds"
 #endif
 #define VIDEO_RATIO_DEFAULT RATIO_CLASSIC_4_3
 #define VFS_ENABLE_DEFAULT true

src/render_layer.cpp

@@ -30,6 +30,13 @@
 #define SKIP_16BPP
 #endif
 
+#if defined(CONFIG_3DS)
+#define SKIP_8BPP
+#if !defined(CONFIG_SDL)
+#define SKIP_16BPP
+#endif
+#endif
+
 #if defined(CONFIG_DJGPP) && !defined(CONFIG_DOS_SVGA)
 #define SKIP_8BPP
 #define SKIP_16BPP