--- hatari/src/includes/main.h	2019/04/01 07:10:53	1.1.1.7
+++ hatari/src/includes/main.h	2019/04/01 07:11:28	1.1.1.8
@@ -10,16 +10,15 @@
 
 typedef int BOOL;
 
-#define PROG_NAME      "Hatari v0.40" /* Name, version for window title */
-#define PROG_VERSION        "v0.40"
-#define VERSION_STRING      "0.40 "   /* Always 6 bytes(inc' NULL) */
-#define VERSION_STRING_SIZE    6      /* Size of above(inc' NULL) */
+#define PROG_NAME      "Hatari v0.50" /* Name, version for window title */
+#define PROG_VERSION        "v0.50"
+#define VERSION_STRING      "0.50 "   /* Always 6 bytes (inc' NULL) */
+#define VERSION_STRING_SIZE    6      /* Size of above (inc' NULL) */
 
 //#define TOTALLY_FINAL_VERSION       /* Web release version... */
 
 #define FINAL_VERSION                 /* Full-speed non-debug version for release */
 //#define DEBUG_TO_FILE               /* Use debug.txt files */
-#define FIND_PERFORMANCE
 
 #ifndef FINAL_VERSION
   #define USE_DEBUGGER                /* Debugger version(non-release) */
@@ -28,20 +27,19 @@ typedef int BOOL;
 
 #ifdef TOTALLY_FINAL_VERSION
   #undef DEBUG_TO_FILE                /* Don't use debug files for final release */
-  #undef FIND_PERFORMANCE
 #endif
 
-#define MAX_FILENAME_LENGTH  256
-#define MAX_STRING_LENGTH  512
-
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <time.h>
-#include <assert.h>
 
+#include <SDL_types.h>
+
+
+#define MAX_STRING_LENGTH  512
 
 #ifndef FALSE
 #define FALSE 0
@@ -73,16 +71,9 @@ enum {
   REG_A4,
   REG_A5,
   REG_A6,
-  REG_A7,    /* ..A7(also SP) */
+  REG_A7,    /* ..A7 (also SP) */
 };
 
-/* PC Condition code's */
-#define PC_CARRY    0x0001  /* Bit 0 */
-#define PC_AUX      0x0010  /* Bit 4 */
-#define PC_ZERO     0x0040  /* Bit 6 */
-#define PC_NEG      0x0080  /* Bit 7 */
-#define PC_OVERFLOW 0x0800  /* Bit 11 */
-
 /* 68000 Condition code's */
 #define SR_AUX      0x0010
 #define SR_NEG      0x0008
@@ -107,19 +98,6 @@ enum {
 #define SR_CLEAR_TRACEMODE  0x7fff
 #define SR_CLEAR_SUPERMODE  0xdfff
 
-/* Emuation condition codes, ordered so can do 'xor al,al' to set XNZVC -0000 */
-#define  EMU_X    0x0100
-#define  EMU_N    0x0080
-#define  EMU_Z    0x0040
-#define  EMU_V    0x0020
-#define  EMU_C    0x0010
-
-#define  EMU_CLEAR_X  0xfeff
-#define  EMU_CLEAR_N  0xff7f
-#define  EMU_CLEAR_Z  0xffbf
-#define  EMU_CLEAR_V  0xffdf
-#define  EMU_CLEAR_C  0xffef
-
 /* Exception vectors */
 #define  EXCEPTION_BUSERROR   0x00000008
 #define  EXCEPTION_ADDRERROR  0x0000000c
@@ -198,7 +176,6 @@ enum {
 #define  GEMDOS_OPCODE        8  /* Free op-code to intercept GemDOS trap */
 #define  RUNOLDGEMDOS_OPCODE  9  /* Free op-code to set PC to old GemDOS vector(if doesn't need to intercept) */
 #define  SYSINIT_OPCODE      10  /* Free op-code to initialize system (connected drives etc.) */
-#define  TIMERD_OPCODE       11  /* Free op-code to prevent Timer D starting in GemDOS */
 #define  VDI_OPCODE          12  /* Free op-code to call VDI handlers AFTER Trap#2 */
 
 
@@ -208,10 +185,9 @@ enum {
 extern BOOL bQuitProgram;
 extern BOOL bEnableDebug;
 extern BOOL bEmulationActive;
-extern char szName[];
-extern char szBootDiscImage[MAX_FILENAME_LENGTH];
-extern char szWorkingDir[MAX_FILENAME_LENGTH];
-extern char szCurrentDir[MAX_FILENAME_LENGTH];
+extern char szBootDiscImage[FILENAME_MAX];
+extern char szWorkingDir[FILENAME_MAX];
+
 
 extern void Main_MemorySnapShot_Capture(BOOL bSave);
 extern void Main_SysError(char *Error,char *Title);