Merge branch 'master' into dev

docs/README.md

@@ -1,3 +1,5 @@
+<img src="resources/icon.png" align="right" />
+
 # Amiga emulator for the Raspberry Pi and other ARM SoC
 Amiberry is an optimized Amiga emulator, for ARM-based boards (like the Raspberry Pi, ASUS Tinkerboard, Odroid XU4, etc). The core emulation comes from WinUAE, but stripped down to remove excess stuff in order to achieve good performance in underpowered boards. It includes JIT CPU and FPU support, to get high-performance results on CPU-intensive emulated environments. On top of that, we have some unique features developed only for Amiberry, such as the WHDLoad booter.
 

src/main.cpp

@@ -467,6 +467,8 @@ static TCHAR *parsetextpath(const TCHAR *s)
 void print_usage()
 {
 	printf("\nUsage:\n");
+	printf(" -h                         Show this help.\n");
+	printf(" --help                     Show this help.\n");
 	printf(" -f <file>                  Load a configuration file.\n");
 	printf(" -config=<file>             Load a configuration file.\n");
 	printf(" -autoload=<file>           Load a WHDLoad game or .CUE CD32 image.\n");
@@ -600,6 +602,10 @@ static void parse_cmdline(int argc, TCHAR **argv)
 			xfree(txt);
 			loaded = true;
 		}
+		else if (_tcscmp(argv[i], _T("-h")) == 0 || _tcsncmp(argv[i], _T("--help"), 6) == 0)
+		{
+			print_usage();
+		}
 		else if (argv[i][0] == '-' && argv[i][1] != '\0') {
 			const TCHAR *arg = argv[i] + 2;
 			const int extra_arg = *arg == '\0';
@@ -738,14 +744,14 @@ static int real_main2 (int argc, TCHAR **argv)
 		fixup_prefs(&currprefs, true);
 	}
 
-	if (!graphics_setup()) {
-		abort();
-	}
-
 	if (restart_config[0])
 		parse_cmdline_and_init_file(argc, argv);
 	else
 		currprefs = changed_prefs;
+	
+	if (!graphics_setup()) {
+		abort();
+	}
 
 	if (!machdep_init()) {
 		restart_program = 0;